Signed settings refactoring: Proper caching and more tests.

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 <signal.h>
 #include <sys/types.h>
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #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/cros_library.h"
 #include "chrome/browser/chromeos/cros/cryptohome_library.h"
+#include "chrome/browser/chromeos/cros_settings.h"
 #include "chrome/browser/chromeos/cros_settings_names.h"
 #include "chrome/browser/chromeos/customization_document.h"
 #include "chrome/browser/chromeos/language_preferences.h"
 #include "chrome/browser/chromeos/login/enrollment/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/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/public/browser/notification_types.h"
 #include "ui/base/accelerators/accelerator.h"
@@ skipping 330 matching lines @@
 }
 
 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.
-  base::FundamentalValue value(usage_statistics_reporting_);
-  SignedSettingsTempStorage::Store(
+  CrosSettings::Get()->SetBoolean(kStatsReportingPref,
+                                  usage_statistics_reporting_);
+/*  base::FundamentalValue value(usage_statistics_reporting_);
+  SignedSettingsCache::Store(
       kStatsReportingPref,
       value,
-      g_browser_process->local_state());
+      g_browser_process->local_state());*/

[Mattias Nissler (ping if slow), 2011/11/30 12:25:50]

commented out? why?

[pastarmovj, 2011/11/30 17:21:16]

Fixed this whole bunch of code I kind of forgot to pimp it while doing the rest.

   bool enabled =
       OptionsUtil::ResolveMetricsReportingEnabled(usage_statistics_reporting_);
   // Make sure the local state cached value is updated too because the real
   // policy will only get written when the owner is created and the cache won't
   // be updated until the policy is reread.
   g_browser_process->local_state()->SetBoolean(kStatsReportingPref, enabled);
   if (enabled) {
 #if defined(USE_LINUX_BREAKPAD)
     // The crash reporter initialization needs IO to complete.
     base::ThreadRestrictions::ScopedAllowIO allow_io;
@@ skipping 294 matching lines @@
 
 bool WizardController::usage_statistics_reporting() const {
   return usage_statistics_reporting_;
 }
 
 void WizardController::SetZeroDelays() {
   kShowDelayMs = 0;
 }
 
 }  // namespace chromeos