Clean up UMA 3g experiment and unify metrics enabled pref for Android

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_macros.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 43 matching lines @@
 // to be done in the main thread.
 // 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) {
-#if !defined(OS_ANDROID)
   g_browser_process->local_state()->SetBoolean(
       metrics::prefs::kMetricsReportingEnabled, updated_pref);
-#endif  // !defined(OS_ANDROID)
 
   UpdateMetricsPrefsOnPermissionChange(updated_pref);
 
   // Uses the current state of whether reporting is enabled to enable services.
   g_browser_process->GetMetricsServicesManager()->UpdateUploadPermissions(true);
 
   if (to_update_pref == updated_pref) {
     RecordMetricsReportingHistogramValue(updated_pref ?
         METRICS_REPORTING_ENABLED : METRICS_REPORTING_DISABLED);
   } else {
     RecordMetricsReportingHistogramValue(METRICS_REPORTING_ERROR);
   }
   if (!callback_fn.is_null())
     callback_fn.Run(updated_pref);
 }
 
 #if defined(OS_CHROMEOS)
 // Callback function for Chrome OS device settings change, so that the update is
 // applied to metrics reporting state.
 void OnDeviceSettingChange() {
   bool enable_metrics = false;
   chromeos::CrosSettings::Get()->GetBoolean(chromeos::kStatsReportingPref,
                                             &enable_metrics);
   ChangeMetricsReportingState(enable_metrics);
 }
 #endif
 
-} // namespace
+}  // namespace
 
 void ChangeMetricsReportingState(bool enabled) {
   ChangeMetricsReportingStateWithReply(enabled,
                                        OnMetricsReportingCallbackType());
 }
 
 // TODO(gayane): Instead of checking policy before setting the metrics pref set
 // the pref and register for notifications for the rest of the changes.
 void ChangeMetricsReportingStateWithReply(
     bool enabled,
@@ skipping 42 matching lines @@
 
 // TODO(gayane): Add unittest which will check that observer on device settings
 // 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)
+#endif  // defined(OS_CHROMEOS)
 }