Consolidates accessing and setting the UMA pref to be within metrics code

chrome/browser/chromeos/login/wizard_controller.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/chromeos/login/wizard_controller.h"
 
 #include <signal.h>
 #include <stdlib.h>
 #include <sys/types.h>
 
@@ skipping 566 matching lines @@
     // remote enrollment. crbug.com/403147.
     ShowEnrollmentScreen();
   } else {
     ShowAutoEnrollmentCheckScreen();
   }
 }
 
 void WizardController::OnEulaAccepted() {
   time_eula_accepted_ = base::Time::Now();
   StartupUtils::MarkEulaAccepted();
-  bool uma_enabled =
-      ResolveMetricsReportingEnabled(usage_statistics_reporting_);
-
-  CrosSettings::Get()->SetBoolean(kStatsReportingPref, uma_enabled);
-  if (uma_enabled) {
-#if defined(GOOGLE_CHROME_BUILD)
-    // The crash reporter initialization needs IO to complete.
-    base::ThreadRestrictions::ScopedAllowIO allow_io;
-    breakpad::InitCrashReporter(std::string());
-#endif
-  }
+  base::Callback<void(bool)> callback_fn = base::Bind(
+      &WizardController::InitiateMetricsReportingChangeCallback,
+      weak_factory_.GetWeakPtr());

[stevenjb, 2014/09/11 20:31:44]

No need for local, just inline this.

[gayane -on leave until 09-2017, 2014/09/12 17:44:51]

Done.

+  InitiateMetricsReportingChange(usage_statistics_reporting_, callback_fn);
 
   if (skip_update_enroll_after_eula_) {
     PerformPostEulaActions();
     ShowAutoEnrollmentCheckScreen();
   } else {
     InitiateOOBEUpdate();
   }
 }
 
+void WizardController::InitiateMetricsReportingChangeCallback(bool enabled) {
+  CrosSettings::Get()->SetBoolean(kStatsReportingPref, enabled);
+  if (enabled) {

[stevenjb, 2014/09/11 20:31:44]

if() could be in #if, but even better, early exit: if (!enabled) return;

[gayane -on leave until 09-2017, 2014/09/12 17:44:51]

Done.

+#if defined(GOOGLE_CHROME_BUILD)
+    // The crash reporter initialization needs IO to complete.
+    base::ThreadRestrictions::ScopedAllowIO allow_io;
+    breakpad::InitCrashReporter(std::string());
+#endif
+  }
+}
+
 void WizardController::OnUpdateErrorCheckingForUpdate() {
   // TODO(nkostylev): Update should be required during OOBE.
   // We do not want to block users from being able to proceed to the login
   // screen if there is any error checking for an update.
   // They could use "browse without sign-in" feature to set up the network to be
   // able to perform the update later.
   OnUpdateCompleted();
 }
 
 void WizardController::OnUpdateErrorUpdating() {
@@ skipping 605 matching lines @@
   if (ShouldAutoStartEnrollment() || ShouldRecoverEnrollment()) {
     StartupUtils::MarkEulaAccepted();
     auth_token_ = token;
     InitiateOOBEUpdate();
   } else {
     LOG(WARNING) << "Not in device enrollment.";
   }
 }
 
 }  // namespace chromeos