brave · bsclifton · Oct 2, 2019 · Mar 12, 2019 · Mar 13, 2019 · Mar 29, 2019
@@ -539,6 +539,22 @@ By installing this extension, you are agreeing to the Google Widevine Terms of U
           Black Stripes
         </message>
       </if>
+      <!-- P3A -->
+      <message name="IDS_BRAVE_CONFIRM_P3A_INFO_BAR" desc="Text that shows on the info bar where user acknowledges the P3A message">
+        Brave uses completely private product analytics to estimate the overall usage of certain features
+      </message>
+      <message name="IDS_BRAVE_CONFIRM_P3A_INFO_BAR_ACKNOWLEDGE" desc="OK button that shows on the info bar where user acknowledges the P3A message">
+        Got it
+      </message>
+      <message name="IDS_BRAVE_CONFIRM_P3A_INFO_BAR_DISABLE" desc="Disable button that shows on the info bar where user acknowledges the P3A message">
+        Disable
+      </message>
+      <message name="IDS_BRAVE_P3A_ENABLE_SETTING" desc="Description that shows in settings for toggling P3A">
+        Automatically send completely private product analytics to Brave
+      </message>
+      <message name="IDS_BRAVE_P3A_ENABLE_SETTING_SUBITEM" desc="Description that shows under main toggle setting for P3A">
+        This anonymous info only lets Brave estimate the overall usage of certain features.
+      </message>
     </messages>
     <includes>
       <include name="IDR_BRAVE_GOOGLE_ANALYTICS_POLYFILL" file="resources/js/google_analytics_polyfill.js" type="BINDATA" />

diff --git a/browser/BUILD.gn b/browser/BUILD.gn
@@ -8,6 +8,7 @@ import("//build/buildflag_header.gni")
 import("//build/config/features.gni")
 import("//extensions/buildflags/buildflags.gni")
 import("//third_party/widevine/cdm/widevine.gni")
+import("//third_party/protobuf/proto_library.gni")
 
 source_set("browser_process") {
   visibility = [
@@ -115,6 +116,7 @@ source_set("browser_process") {
     "//brave/components/content_settings/core/browser",
     "//brave/components/greaselion/browser/buildflags",
     "//brave/components/ntp_tiles",
+    "//brave/components/p3a",
     "//brave/components/resources",
     "//brave/components/services:brave_content_manifest_overlays",
     "//chrome/common",
@@ -159,6 +161,7 @@ source_set("browser_process") {
 
     deps += [
       "importer",
+      "infobars",
       "//brave/app:brave_generated_resources_grit",
     ]
   } else {

diff --git a/browser/brave_browser_main_extra_parts.cc b/browser/brave_browser_main_extra_parts.cc
@@ -6,13 +6,39 @@
 #include "brave/browser/brave_browser_main_extra_parts.h"
 
 #include "brave/browser/brave_browser_process_impl.h"
-#include "chrome/browser/first_run/first_run.h"
+#include "brave/components/brave_shields/browser/brave_shields_p3a.h"
+#include "brave/components/p3a/buildflags.h"
+#include "brave/components/p3a/brave_p3a_service.h"
 #include "third_party/widevine/cdm/buildflags.h"
 
+#if !defined(OS_ANDROID)
+#include "brave/browser/importer/brave_importer_p3a.h"
+#include "brave/components/p3a/p3a_core_metrics.h"
+#include "chrome/browser/first_run/first_run.h"
+#endif  // !defined(OS_ANDROID)
+
 #if BUILDFLAG(BUNDLE_WIDEVINE_CDM)
 #include "brave/browser/widevine/brave_widevine_bundle_manager.h"
 #endif
 
+namespace {
+
+// Records default values for some histograms because we want these stats to be
+// uploaded anyways. Corresponding components will write new values according
+// to their usage scenarios.
+void RecordInitialP3AValues() {
+#if !defined(OS_ANDROID)
+  if (first_run::IsChromeFirstRun()) {
+    RecordImporterP3A(importer::ImporterType::TYPE_UNKNOWN);
+  }
+#endif  // !defined(OS_ANDROID)
+
+  brave_shields::MaybeRecordShieldsUsageP3A(brave_shields::kNeverClicked,
+                                            g_browser_process->local_state());
+}
+
+}  // namespace
+
 BraveBrowserMainExtraParts::BraveBrowserMainExtraParts() {
 }
 
@@ -35,4 +61,17 @@ void BraveBrowserMainExtraParts::PreMainMessageLoopRun() {
   // So, call it after browser threads are created.
   g_brave_browser_process->brave_widevine_bundle_manager()->StartupCheck();
 #endif
+  // Disabled on mobile platforms, see for instance issues/6176
+#if BUILDFLAG(BRAVE_P3A_ENABLED)
+  // TODO(iefremov): Maybe find a better place for this initialization.
+  g_brave_browser_process->brave_p3a_service()->Init();
+#endif  // BUILDFLAG(BRAVE_P3A_ENABLED)
+
+  RecordInitialP3AValues();
+
+  // The code below is not supported on android.
+#if !defined(OS_ANDROID)
+  brave::BraveWindowTracker::CreateInstance(g_browser_process->local_state());
+  brave::BraveUptimeTracker::CreateInstance(g_browser_process->local_state());
+#endif  // !defined(OS_ANDROID)
 }
diff --git a/browser/brave_browser_main_parts.cc b/browser/brave_browser_main_parts.cc
@@ -4,8 +4,39 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "brave/browser/brave_browser_main_parts.h"
+
 #include "brave/browser/browsing_data/brave_clear_browsing_data.h"
 
+#if !defined(OS_ANDROID)
+#include "brave/browser/infobars/brave_confirm_p3a_infobar_delegate.h"
+#include "chrome/browser/ui/browser_finder.h"
+#include "chrome/browser/browser_process.h"
+#include "chrome/browser/infobars/infobar_service.h"
+#include "content/public/browser/web_contents.h"
+#endif
+
+void BraveBrowserMainParts::PostBrowserStart() {
+  ChromeBrowserMainParts::PostBrowserStart();
+#if !defined(OS_ANDROID)
+  Browser* browser = chrome::FindLastActive();
+  content::WebContents* active_web_contents = nullptr;
+
+  if (browser) {
+    active_web_contents = browser->tab_strip_model()->GetActiveWebContents();
+
+    if (active_web_contents) {
+      InfoBarService* infobar_service =
+          InfoBarService::FromWebContents(active_web_contents);
+
+      if (infobar_service) {
+        BraveConfirmP3AInfoBarDelegate::Create(
+            infobar_service, g_browser_process->local_state());
+      }
+    }
+  }
+#endif  // !defined(OS_ANDROID)
+}
+
 void BraveBrowserMainParts::PreShutdown() {
   content::BraveClearBrowsingData::ClearOnExit();
 }
diff --git a/browser/brave_browser_main_parts.h b/browser/brave_browser_main_parts.h
@@ -14,6 +14,7 @@ class BraveBrowserMainParts : public ChromeBrowserMainParts {
   using ChromeBrowserMainParts::ChromeBrowserMainParts;
   ~BraveBrowserMainParts() override = default;
 
+  void PostBrowserStart() override;
   void PreShutdown() override;
 
  private:

diff --git a/browser/brave_browser_process_impl.cc b/browser/brave_browser_process_impl.cc
@@ -24,6 +24,9 @@
 #include "brave/components/brave_shields/browser/https_everywhere_service.h"
 #include "brave/components/brave_shields/browser/referrer_whitelist_service.h"
 #include "brave/components/brave_shields/browser/tracking_protection_service.h"
+#include "brave/components/p3a/buildflags.h"
+#include "brave/components/p3a/brave_histogram_rewrite.h"
+#include "brave/components/p3a/brave_p3a_service.h"
 #include "chrome/common/chrome_paths.h"
 #include "components/component_updater/component_updater_service.h"
 #include "components/component_updater/timer_update_scheduler.h"
@@ -80,6 +83,13 @@ BraveBrowserProcessImpl::BraveBrowserProcessImpl(StartupData* startup_data)
                        stats_updater->Start();
                      },
                      base::Unretained(brave_stats_updater())));
+  // Disabled on mobile platforms, see for instance issues/6176
+#if BUILDFLAG(BRAVE_P3A_ENABLED)
+  // Create P3A Service early to catch more histograms. The full initialization
+  // should be started once browser process impl is ready.
+  brave_p3a_service();
+  brave::SetupHistogramsBraveization();
+#endif  // BUILDFLAG(BRAVE_P3A_ENABLED)
 }
 
 brave_component_updater::BraveComponent::Delegate*
@@ -228,13 +238,13 @@ BraveBrowserProcessImpl::tor_client_updater() {
 }
 #endif
 
-void BraveBrowserProcessImpl::CreateProfileManager() {
-  DCHECK(!created_profile_manager_ && !profile_manager_);
-  created_profile_manager_ = true;
-
-  base::FilePath user_data_dir;
-  base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
-  profile_manager_ = std::make_unique<BraveProfileManager>(user_data_dir);
+brave::BraveP3AService* BraveBrowserProcessImpl::brave_p3a_service() {
+  if (brave_p3a_service_) {
+    return brave_p3a_service_.get();
+  }
+  brave_p3a_service_ = new brave::BraveP3AService(local_state());
+  brave_p3a_service()->InitCallbacks();
+  return brave_p3a_service_.get();
 }
 
 #if BUILDFLAG(BUNDLE_WIDEVINE_CDM)
@@ -251,3 +261,12 @@ brave::BraveStatsUpdater* BraveBrowserProcessImpl::brave_stats_updater() {
     brave_stats_updater_ = brave::BraveStatsUpdaterFactory(local_state());
   return brave_stats_updater_.get();
 }
+
+void BraveBrowserProcessImpl::CreateProfileManager() {
+  DCHECK(!created_profile_manager_ && !profile_manager_);
+  created_profile_manager_ = true;
+
+  base::FilePath user_data_dir;
+  base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
+  profile_manager_ = std::make_unique<BraveProfileManager>(user_data_dir);
+}
diff --git a/browser/brave_browser_process_impl.h b/browser/brave_browser_process_impl.h
@@ -8,6 +8,7 @@
 
 #include <memory>
 
+#include "base/memory/ref_counted.h"
 #include "brave/browser/tor/buildflags.h"
 #include "brave/components/brave_component_updater/browser/brave_component.h"
 #include "brave/components/brave_referrals/buildflags/buildflags.h"
@@ -19,6 +20,7 @@
 namespace brave {
 class BraveReferralsService;
 class BraveStatsUpdater;
+class BraveP3AService;
 }  // namespace brave
 
 #if BUILDFLAG(BUNDLE_WIDEVINE_CDM)
@@ -83,6 +85,7 @@ class BraveBrowserProcessImpl : public BrowserProcessImpl {
 #if BUILDFLAG(ENABLE_TOR)
   extensions::BraveTorClientUpdater* tor_client_updater();
 #endif
+  brave::BraveP3AService* brave_p3a_service();
 #if BUILDFLAG(BUNDLE_WIDEVINE_CDM)
   BraveWidevineBundleManager* brave_widevine_bundle_manager();
 #endif
@@ -129,6 +132,7 @@ class BraveBrowserProcessImpl : public BrowserProcessImpl {
 #if BUILDFLAG(BUNDLE_WIDEVINE_CDM)
   std::unique_ptr<BraveWidevineBundleManager> brave_widevine_bundle_manager_;
 #endif
+  scoped_refptr<brave::BraveP3AService> brave_p3a_service_;
 
   SEQUENCE_CHECKER(sequence_checker_);
 

diff --git a/browser/brave_local_state_prefs.cc b/browser/brave_local_state_prefs.cc
@@ -11,8 +11,11 @@
 #include "brave/browser/tor/buildflags.h"
 #include "brave/components/brave_referrals/buildflags/buildflags.h"
 #include "brave/components/brave_shields/browser/ad_block_service.h"
-#include "chrome/browser/first_run/first_run.h"
+#include "brave/components/brave_shields/browser/brave_shields_p3a.h"
+#include "brave/components/p3a/buildflags.h"
+#include "brave/components/p3a/brave_p3a_service.h"
 #include "chrome/common/pref_names.h"
+#include "chrome/browser/first_run/first_run.h"
 #include "components/metrics/metrics_pref_names.h"
 #include "components/prefs/pref_registry_simple.h"
 
@@ -24,6 +27,10 @@
 #include "brave/browser/tor/tor_profile_service.h"
 #endif
 
+#if !defined(OS_ANDROID)
+#include "brave/components/p3a/p3a_core_metrics.h"
+#endif  // !defined(OS_ANDROID)
+
 namespace brave {
 
 void RegisterLocalStatePrefs(PrefRegistrySimple* registry) {
@@ -43,10 +50,19 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) {
 #if !defined(OS_ANDROID)
   RegisterPrefsForMuonMigration(registry);
 #endif
-
   registry->SetDefaultPrefValue(
       metrics::prefs::kMetricsReportingEnabled,
       base::Value(GetDefaultPrefValueForMetricsReporting()));
+
+#if BUILDFLAG(BRAVE_P3A_ENABLED)
+  brave::BraveP3AService::RegisterPrefs(registry);
+#endif  // BUILDFLAG(BRAVE_P3A_ENABLED)
+
+  brave_shields::RegisterShieldsP3APrefs(registry);
+#if !defined(OS_ANDROID)
+  BraveWindowTracker::RegisterPrefs(registry);
+  BraveUptimeTracker::RegisterPrefs(registry);
+#endif
 }
 
 }  // namespace brave
diff --git a/browser/brave_stats_updater.cc b/browser/brave_stats_updater.cc
@@ -37,40 +37,15 @@ const int kUpdateServerPeriodicPingFrequency = 5 * 60;
 
 namespace {
 
-std::string GetChannelName() {
-  std::string channel = chrome::GetChannelName();
-  if (channel.empty())
-    channel = "release";
-  return channel;
-}
-
-std::string GetPlatformIdentifier() {
-#if defined(OS_WIN)
-  if (base::SysInfo::OperatingSystemArchitecture() == "x86")
-    return "winia32-bc";
-  else
-    return "winx64-bc";
-#elif defined(OS_MACOSX)
-  return "osx-bc";
-#elif defined(OS_ANDROID)
-  return "android-bc";
-#elif defined(OS_LINUX)
-  return "linux-bc";
-#else
-  return std::string();
-#endif
-}
-
 GURL GetUpdateURL(const GURL& base_update_url,
                   const brave::BraveStatsUpdaterParams& stats_updater_params) {
   GURL update_url(base_update_url);
   update_url = net::AppendQueryParameter(update_url, "platform",
-                                         GetPlatformIdentifier());
+                                         brave::GetPlatformIdentifier());
   update_url =
-      net::AppendQueryParameter(update_url, "channel", GetChannelName());
-  update_url = net::AppendQueryParameter(
-      update_url, "version",
-      version_info::GetBraveVersionWithoutChromiumMajorVersion());
+      net::AppendQueryParameter(update_url, "channel", brave::GetChannelName());
+  update_url = net::AppendQueryParameter(update_url, "version",
+                    version_info::GetBraveVersionWithoutChromiumMajorVersion());
   update_url = net::AppendQueryParameter(update_url, "daily",
                                          stats_updater_params.GetDailyParam());
   update_url = net::AppendQueryParameter(update_url, "weekly",

diff --git a/browser/brave_stats_updater_params.cc b/browser/brave_stats_updater_params.cc
@@ -112,38 +112,7 @@ int BraveStatsUpdaterParams::GetCurrentMonth() const {
 }
 
 int BraveStatsUpdaterParams::GetCurrentISOWeekNumber() const {
-  base::Time now = GetCurrentTimeNow();
-  base::Time::Exploded now_exploded;
-  now.LocalExplode(&now_exploded);
-  now_exploded.hour = 0;
-  now_exploded.minute = 0;
-  now_exploded.second = 0;
-  now_exploded.millisecond = 0;
-  now_exploded.day_of_month =
-      now_exploded.day_of_month + 3 - ((now_exploded.day_of_week + 6) % 7);
-
-  base::Time now_adjusted;
-  if (!base::Time::FromLocalExploded(now_exploded, &now_adjusted))
-    return 0;
-
-  base::Time::Exploded jan4_exploded = {0};
-  jan4_exploded.year = now_exploded.year;
-  jan4_exploded.month = 1;
-  jan4_exploded.day_of_week = 0;
-  jan4_exploded.day_of_month = 4;
-  jan4_exploded.hour = 0;
-  jan4_exploded.minute = 0;
-  jan4_exploded.second = 0;
-  jan4_exploded.millisecond = 0;
-
-  base::Time jan4_time;
-  if (!base::Time::FromLocalExploded(jan4_exploded, &jan4_time))
-    return 0;
-
-  return 1 + std::round(
-                 ((now_adjusted.ToJsTime() - jan4_time.ToJsTime()) / 86400000 -
-                  3 + (jan4_exploded.day_of_week + 6) % 7) /
-                 7);
+  return GetIsoWeekNumber(GetCurrentTimeNow());
 }
 
 base::Time BraveStatsUpdaterParams::GetCurrentTimeNow() const {