more

chromium_src/chrome/browser/browser_process_impl.cc

@@ -18,6 +18,7 @@
 #include "chrome/browser/background/background_mode_manager.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
+#include "chrome/browser/metrics/chrome_metrics_services_manager_client.h"
 #include "chrome/browser/prefs/chrome_command_line_pref_store.h"
 #include "chrome/browser/printing/print_job_manager.h"
 #include "chrome/browser/profiles/profile_manager.h"
@@ -27,6 +28,7 @@
 #include "chrome/common/chrome_paths.h"
 #include "chrome/installer/util/google_update_settings.h"
 #include "components/component_updater/component_updater_service.h"
+#include "components/metrics_services_manager/metrics_services_manager.h"
 #include "components/metrics/metrics_pref_names.h"
 #include "components/password_manager/core/browser/password_manager.h"
 #include "components/prefs/json_pref_store.h"
@@ -454,8 +456,19 @@ net_log::ChromeNetLog* BrowserProcessImpl::net_log() {
 
 metrics_services_manager::MetricsServicesManager*
 BrowserProcessImpl::GetMetricsServicesManager() {
-  NOTIMPLEMENTED();
-  return nullptr;
+  DCHECK(thread_checker_.CalledOnValidThread());
+  if (!metrics_services_manager_) {
+    metrics_services_manager_.reset(
+        new metrics_services_manager::MetricsServicesManager(
+            base::MakeUnique<ChromeMetricsServicesManagerClient>(
+                local_state())));
+  }
+  return metrics_services_manager_.get();
+}
+
+metrics::MetricsService* BrowserProcessImpl::metrics_service() {
+  DCHECK(thread_checker_.CalledOnValidThread());
+  return GetMetricsServicesManager()->GetMetricsService();
 }
 
 net::URLRequestContextGetter* BrowserProcessImpl::system_request_context() {

chromium_src/chrome/browser/browser_process_impl.h

@@ -76,7 +76,7 @@ class BrowserProcessImpl : public BrowserProcess {
   atom::api::App* app() { return app_; }
 
   void ResourceDispatcherHostCreated() override;
-  metrics::MetricsService* metrics_service() override { return NULL; };
+  metrics::MetricsService* metrics_service() override;
   PrefService* local_state() override;
   ProfileManager* profile_manager() override;
   ukm::UkmRecorder* ukm_recorder() override;
@@ -151,6 +151,8 @@ class BrowserProcessImpl : public BrowserProcess {
   void CreateStatusTray();
   void ApplyMetricsReportingPolicy();
 
+  std::unique_ptr<metrics_services_manager::MetricsServicesManager>
+      metrics_services_manager_;
 
   const scoped_refptr<base::SequencedTaskRunner> local_state_task_runner_;
   PrefChangeRegistrar pref_change_registrar_;

patches/master_patch.patch

@@ -803,6 +803,41 @@ index b5f779d03cfec8ce1db9354d85020acaa10c3a5b..04db5469f8b3705bbf0c36fe6eef5ce1
    // This environment variable should be set on Windows Vista and later
    // (https://msdn.microsoft.com/library/windows/desktop/dd378457.aspx).
    std::wstring user_data_dir = GetEnvironmentString16(L"LOCALAPPDATA");
+diff --git a/chrome/installer/util/browser_distribution.cc b/chrome/installer/util/browser_distribution.cc
+index ac6a3e41ef2c4e82eab088b39abc0d17c4db0f0e..5149d6638b5146d8dc21aed5cc508d613c26fd69 100644
+--- a/chrome/installer/util/browser_distribution.cc
++++ b/chrome/installer/util/browser_distribution.cc
+@@ -20,6 +20,10 @@
+ #include "chrome/installer/util/l10n_string_util.h"
+ #include "chrome/installer/util/non_updating_app_registration_data.h"
+
++#if !defined(MUON_CHROMIUM_BUILD)
++#include "chrome/installer/util/muon_distribution.h"
++#endif
++
+ namespace {
+
+ // The BrowserDistribution object is never freed.
+@@ -55,6 +59,7 @@ BrowserDistribution* BrowserDistribution::GetOrCreateBrowserDistribution(
+ BrowserDistribution* BrowserDistribution::GetDistribution() {
+   BrowserDistribution* dist = NULL;
+
++#if defined(MUON_CHROMIUM_BUILD)
+ #if defined(GOOGLE_CHROME_BUILD)
+   dist = GetOrCreateBrowserDistribution<GoogleChromeDistribution>(
+       &g_browser_distribution);
+@@ -62,7 +67,10 @@ BrowserDistribution* BrowserDistribution::GetDistribution() {
+   dist = GetOrCreateBrowserDistribution<BrowserDistribution>(
+       &g_browser_distribution);
+ #endif
+-
++#else
++  dist = GetOrCreateBrowserDistribution<MuonDistribution>(
++      &g_browser_distribution);
++#endif
+   return dist;
+ }
+
 diff --git a/chrome/installer/util/prebuild/create_string_rc.py b/chrome/installer/util/prebuild/create_string_rc.py
 index ce885e05e62af97777314397c79d1f05aa0dc36a..c2b8a35bfdbd6a23ce288b2007dcb8ce7fee8657 100755
 --- a/chrome/installer/util/prebuild/create_string_rc.py