Add network information to UKM

chrome/browser/metrics/chrome_metrics_service_client.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/metrics/chrome_metrics_service_client.h"
 
 #include <stddef.h>
 
 #include <set>
 #include <utility>
@@ skipping 546 matching lines @@
   // Clear deprecated metrics preference for Android.
   // TODO(gayane): Cleanup this code after M60 when the pref would be cleared
   // from clients.
 #if defined(OS_ANDROID)
   local_state->ClearPref(prefs::kCrashReportingEnabled);
 #endif
 
   metrics_service_.reset(
       new metrics::MetricsService(metrics_state_manager_, this, local_state));
 
-  if (base::FeatureList::IsEnabled(ukm::kUkmFeature))
+  RegisterMetricsServiceProviders();
+
+  if (base::FeatureList::IsEnabled(ukm::kUkmFeature)) {
     ukm_service_.reset(new ukm::UkmService(local_state, this));
+    RegisterUKMProviders();
+  }
+}
+
+void ChromeMetricsServiceClient::RegisterMetricsServiceProviders() {
+  PrefService* local_state = g_browser_process->local_state();
 
   // Gets access to persistent metrics shared by sub-processes.
   metrics_service_->RegisterMetricsProvider(
       std::unique_ptr<metrics::MetricsProvider>(
           new SubprocessMetricsProvider()));
 
-  // Register metrics providers.
 #if BUILDFLAG(ENABLE_EXTENSIONS)
   metrics_service_->RegisterMetricsProvider(
       std::unique_ptr<metrics::MetricsProvider>(
           new ExtensionsMetricsProvider(metrics_state_manager_)));
 #endif
 
   metrics_service_->RegisterMetricsProvider(
       base::MakeUnique<metrics::NetworkMetricsProvider>(
           base::MakeUnique<metrics::NetworkQualityEstimatorProviderImpl>(
               g_browser_process->io_thread()),
           content::BrowserThread::GetBlockingPool()));
 
   // Currently, we configure OmniboxMetricsProvider to not log events to UMA
   // if there is a single incognito session visible. In the future, it may
   // be worth revisiting this to still log events from non-incognito sessions.
   metrics_service_->RegisterMetricsProvider(
       std::unique_ptr<metrics::MetricsProvider>(new OmniboxMetricsProvider(
           base::Bind(&chrome::IsIncognitoSessionActive))));
+
   metrics_service_->RegisterMetricsProvider(
       std::unique_ptr<metrics::MetricsProvider>(
           new ChromeStabilityMetricsProvider(local_state)));
+
   metrics_service_->RegisterMetricsProvider(
       std::unique_ptr<metrics::MetricsProvider>(
           new metrics::GPUMetricsProvider));
+
   metrics_service_->RegisterMetricsProvider(
       std::unique_ptr<metrics::MetricsProvider>(
           new metrics::ScreenInfoMetricsProvider));
 
   metrics_service_->RegisterMetricsProvider(CreateFileMetricsProvider(
       ChromeMetricsServiceAccessor::IsMetricsAndCrashReportingEnabled()));
 
   drive_metrics_provider_ = new metrics::DriveMetricsProvider(
       content::BrowserThread::GetTaskRunnerForThread(
           content::BrowserThread::FILE),
@@ skipping 95 matching lines @@
 
   metrics_service_->RegisterMetricsProvider(
       std::unique_ptr<metrics::MetricsProvider>(
           new HttpsEngagementMetricsProvider()));
 
   metrics_service_->RegisterMetricsProvider(
       std::unique_ptr<metrics::MetricsProvider>(
           new CertificateReportingMetricsProvider()));
 }
 
+void ChromeMetricsServiceClient::RegisterUKMProviders() {
+  ukm_service_->RegisterMetricsProvider(
+      base::MakeUnique<metrics::NetworkMetricsProvider>(
+          base::MakeUnique<metrics::NetworkQualityEstimatorProviderImpl>(
+              g_browser_process->io_thread()),
+          content::BrowserThread::GetBlockingPool()));
+}
+
 bool ChromeMetricsServiceClient::ShouldIncludeProfilerDataInLog() {
   // Upload profiler data at most once per session.
   if (has_uploaded_profiler_data_)
     return false;
 
   // For each log, flip a fair coin. Thus, profiler data is sent with the first
   // log with probability 50%, with the second log with probability 25%, and so
   // on. As a result, uploaded data is biased toward earlier logs.
   // TODO(isherman): Explore other possible algorithms, and choose one that
   // might be more appropriate.  For example, it might be reasonable to include
@@ skipping 195 matching lines @@
 }
 
 bool ChromeMetricsServiceClient::IsUMACellularUploadLogicEnabled() {
   return metrics::IsCellularLogicEnabled();
 }
 
 void ChromeMetricsServiceClient::OnHistoryDeleted() {
   if (ukm_service_)
     ukm_service_->Purge();
 }