Revert 94350 - Merge 94322 - Rewire the metrics pref to the signed settings store on chromeos.

chrome/browser/chromeos/login/wizard_controller.cc

 // Copyright (c) 2011 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 <gdk/gdk.h>
 #include <signal.h>
 #include <sys/types.h>
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/threading/thread_restrictions.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/chromeos/cros_settings_names.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/cryptohome_library.h"
 #include "chrome/browser/chromeos/customization_document.h"
 #include "chrome/browser/chromeos/language_preferences.h"
 #include "chrome/browser/chromeos/login/enterprise_enrollment_screen.h"
 #include "chrome/browser/chromeos/login/eula_screen.h"
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/html_page_screen.h"
 #include "chrome/browser/chromeos/login/login_display_host.h"
 #include "chrome/browser/chromeos/login/login_utils.h"
 #include "chrome/browser/chromeos/login/network_screen.h"
 #include "chrome/browser/chromeos/login/oobe_display.h"
 #include "chrome/browser/chromeos/login/registration_screen.h"
-#include "chrome/browser/chromeos/login/signed_settings_temp_storage.h"
 #include "chrome/browser/chromeos/login/update_screen.h"
 #include "chrome/browser/chromeos/login/user_image_screen.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/login/wizard_accessibility_helper.h"
+#include "chrome/browser/chromeos/metrics_cros_settings_provider.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile_manager.h"
-#include "chrome/browser/ui/options/options_util.h"
 #include "chrome/common/pref_names.h"
 #include "content/common/content_notification_types.h"
 #include "content/common/notification_service.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "views/accelerator.h"
 
-#if defined(USE_LINUX_BREAKPAD)
-#include "chrome/app/breakpad_linux.h"
-#endif
-
 namespace {
 
 // A boolean pref of the EULA accepted flag.
 const char kEulaAccepted[] = "EulaAccepted";
 
 // A string pref with initial locale set in VPD or manifest.
 const char kInitialLocale[] = "intl.initial_locale";
 
 // A boolean pref of the OOBE complete flag (first OOBE part before login).
 const char kOobeComplete[] = "OobeComplete";
@@ skipping 315 matching lines @@
   // TODO(dpolukhin): show error message after login screen is displayed.
   ShowLoginScreen();
 }
 
 void WizardController::OnUpdateCompleted() {
   OnOOBECompleted();
 }
 
 void WizardController::OnEulaAccepted() {
   MarkEulaAccepted();
-  // TODO(pastarmovj): Make this code cache the value for the pref in a better
-  // way until we can store it in the policy blob. See explanation below:
-  // At this point we can not write this in the signed settings pref blob.
-  // But we can at least create the consent file and Chrome would port that
-  // if the device is owned by a local user. In case of enterprise enrolled
-  // device the setting will be respected only until the policy is not set.
-  SignedSettingsTempStorage::Store(
-      kStatsReportingPref,
-      (usage_statistics_reporting_ ? "true" : "false"),
-      g_browser_process->local_state());
-  bool enabled =
-      OptionsUtil::ResolveMetricsReportingEnabled(usage_statistics_reporting_);
-  if (enabled) {
-#if defined(USE_LINUX_BREAKPAD)
-    InitCrashReporter();
-#endif
-  }
-
+  chromeos::MetricsCrosSettingsProvider::SetMetricsStatus(
+      usage_statistics_reporting_);
   InitiateOOBEUpdate();
 }
 
 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.
   OnOOBECompleted();
@@ skipping 286 matching lines @@
 
 bool WizardController::usage_statistics_reporting() const {
   return usage_statistics_reporting_;
 }
 
 void WizardController::SetZeroDelays() {
   kShowDelayMs = 0;
 }
 
 }  // namespace chromeos