Do not include p3a_core_metrics.h on Android at all

brave · Nov 16, 2020 · 6a4a4ad · 6a4a4ad
1 parent c2b3946
commit 6a4a4ad
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/browser/brave_local_state_prefs.cc b/browser/brave_local_state_prefs.cc
@@ -36,10 +36,10 @@
 #include "brave/components/ipfs/ipfs_service.h"
 #endif
 
-#include "brave/browser/p3a/p3a_core_metrics.h"
 #include "brave/browser/ui/webui/new_tab_page/brave_new_tab_message_handler.h"
 
 #if !defined(OS_ANDROID)
+#include "brave/browser/p3a/p3a_core_metrics.h"
 #include "chrome/browser/first_run/first_run.h"
 #endif  // !defined(OS_ANDROID)
 

diff --git a/browser/p3a/p3a_core_metrics.h b/browser/p3a/p3a_core_metrics.h
@@ -6,14 +6,23 @@
 #ifndef BRAVE_BROWSER_P3A_P3A_CORE_METRICS_H_
 #define BRAVE_BROWSER_P3A_P3A_CORE_METRICS_H_
 
+// The classes below can be used on desktop only
+// because BrowserListObserver is available on desktop only
+// Brave.Uptime.BrowserOpenMinutes, Brave.Core.LastTimeIncognitoUsed and
+// Brave.Core.TorEverUsed don't work on Android
+
+#include "build/build_config.h"
+
+#if defined(OS_ANDROID)
+#error This file should only be included on desktop.
+#endif
+
 #include <list>
 
 #include "base/timer/timer.h"
 #include "brave/components/weekly_storage/weekly_storage.h"
-#if !defined(OS_ANDROID)
 #include "chrome/browser/resource_coordinator/usage_clock.h"
 #include "chrome/browser/ui/browser_list_observer.h"
-#endif  // !defined(OS_ANDROID)
 
 class PrefService;
 class PrefRegistrySimple;
@@ -33,9 +42,7 @@ class BraveUptimeTracker {
   void RecordUsage();
   void RecordP3A();
 
-#if !defined(OS_ANDROID)
   resource_coordinator::UsageClock usage_clock_;
-#endif  // !defined(OS_ANDROID)
   base::RepeatingTimer timer_;
   base::TimeDelta current_total_usage_;
   WeeklyStorage state_;