Enabled client side sampling for user metrics reporting.

chrome/browser/metrics/metrics_reporting_state.cc

 // Copyright (c) 2012 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/metrics_reporting_state.h"
 
 #include "base/callback.h"
 #include "base/metrics/histogram.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/installer/util/google_update_settings.h"
 #include "components/metrics/metrics_pref_names.h"
 #include "components/metrics/metrics_service.h"
+#include "components/metrics_services_manager/metrics_services_manager.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/browser_thread.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chromeos/settings/cros_settings_names.h"
 #endif  // defined(OS_CHROMEOS)
 
 namespace {
@@ skipping 27 matching lines @@
 // As arguments this function gets:
 //  |to_update_pref| which indicates what the desired update should be,
 //  |callback_fn| is the callback function to be called in the end
 //  |updated_pref| is the result of attempted update.
 // Update considers to be successful if |to_update_pref| and |updated_pref| are
 // the same.
 void SetMetricsReporting(bool to_update_pref,
                          const OnMetricsReportingCallbackType& callback_fn,
                          bool updated_pref) {
   metrics::MetricsService* metrics = g_browser_process->metrics_service();
-  if (metrics) {
-    if (updated_pref)
-      metrics->Start();
-    else
-      metrics->Stop();
-  }
 
 #if !defined(OS_ANDROID)
   g_browser_process->local_state()->SetBoolean(
       metrics::prefs::kMetricsReportingEnabled, updated_pref);
 #endif  // !defined(OS_ANDROID)
 
+  // Uses the current state of whether reporting is enabled to enabled services.
+  g_browser_process->GetMetricsServicesManager()->UpdateUploadPermissions(true);

[Alexei Svitkine (slow), 2016/07/19 15:23:59]

Shouldn't this be updated_pref value and not |true|?

Can this have a unit test?

[jwd, 2016/07/19 21:21:49]

No, the true refers to the "can upload" permission, which is the android
connection type related stuff. It's the same as
https://cs.chromium.org/chromium/src/chrome/browser/chrome_browser_main.cc?l=807
done on startup.

SetMetricsReporting is only called from  InitiateMetricsReportingChange, which
isn't called on Android. Android settings use a totally different method, and
doesn't actually update the running services.

I had considered having an unsupported platform error at the top of this
function for android, and getting rid of the if !defined block.
Probably yes, I'll do that.

+
   // When a user opts in to the metrics reporting service, the previously
   // collected data should be cleared to ensure that nothing is reported before
   // a user opts in and all reported data is accurate.
   if (updated_pref && metrics)
     metrics->ClearSavedStabilityMetrics();
 
   if (to_update_pref == updated_pref) {
     RecordMetricsReportingHistogramValue(updated_pref ?
         METRICS_REPORTING_ENABLED : METRICS_REPORTING_DISABLED);
   } else {
@@ skipping 50 matching lines @@
 // will trigger this function and kMetricsReportinEnabled as well as metrics
 // service state will be updated accordingly.
 void SetupMetricsStateForChromeOS() {
 #if defined(OS_CHROMEOS)
   chromeos::CrosSettings::Get()->AddSettingsObserver(
       chromeos::kStatsReportingPref, base::Bind(&OnDeviceSettingChange));
 
   OnDeviceSettingChange();
 #endif // defined(OS_CHROMEOS)
 }