WIP: build flag enabled, code just compiles

brave · Nov 3, 2020 · fdd2c76 · fdd2c76
1 parent 8f78c8f
commit fdd2c76
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/browser/brave_local_state_prefs.cc b/browser/brave_local_state_prefs.cc
@@ -18,7 +18,6 @@
 #include "brave/components/p3a/brave_p3a_service.h"
 #include "brave/components/p3a/buildflags.h"
 #include "brave/components/tor/buildflags/buildflags.h"
-#include "chrome/browser/first_run/first_run.h"
 #include "chrome/common/pref_names.h"
 #include "components/metrics/metrics_pref_names.h"
 #include "components/prefs/pref_registry_simple.h"
@@ -36,8 +35,9 @@
 #include "brave/components/ipfs/ipfs_service.h"
 #endif
 
-#if !defined(OS_ANDROID)
 #include "brave/browser/p3a/p3a_core_metrics.h"
+#if !defined(OS_ANDROID)
+#include "chrome/browser/first_run/first_run.h"
 #endif  // !defined(OS_ANDROID)
 
 #if BUILDFLAG(ENABLE_WIDEVINE)
@@ -71,7 +71,14 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) {
 
 #if BUILDFLAG(BRAVE_P3A_ENABLED)
   brave::BraveP3AService::RegisterPrefs(registry,
-                                        first_run::IsChromeFirstRun());
+#if !defined(OS_ANDROID)
+                                        first_run::IsChromeFirstRun()
+#else
+                                        // BraveP3AService::RegisterPrefs
+                                        // doesn't use this arg on Android
+                                        false
+#endif  // !defined(OS_ANDROID)
+                                      );
 #endif  // BUILDFLAG(BRAVE_P3A_ENABLED)
 
   brave_shields::RegisterShieldsP3APrefs(registry);

diff --git a/browser/p3a/p3a_core_metrics.h b/browser/p3a/p3a_core_metrics.h
@@ -10,8 +10,10 @@
 
 #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;
@@ -31,14 +33,20 @@ 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_;
 
   DISALLOW_COPY_AND_ASSIGN(BraveUptimeTracker);
 };
 
+// BraveWindowTracker is under !OS_ANDROID guard because
+// BrowserListObserver should only be only on desktop
+// Brave.Uptime.BrowserOpenMinutes doesn't work on Android
+#if !defined(OS_ANDROID)
 // Periodically records P3A stats (extracted from Local State) regarding the
 // time when incognito windows were used.
 // Used as a leaking singletone.
@@ -62,6 +70,7 @@ class BraveWindowTracker : public BrowserListObserver {
   PrefService* local_state_;
   DISALLOW_COPY_AND_ASSIGN(BraveWindowTracker);
 };
+#endif  // !defined(OS_ANDROID)
 
 }  // namespace brave
 

diff --git a/components/p3a/buildflags.gni b/components/p3a/buildflags.gni
@@ -1,5 +1,5 @@
 import("//build/config/features.gni")
 
 declare_args() {
-  brave_p3a_enabled = !is_ios && !is_android
+  brave_p3a_enabled = !is_ios
 }