Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

chrome/browser/policy/cloud_policy_subsystem.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/policy/cloud_policy_subsystem.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/command_line.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/policy/cloud_policy_cache_base.h"
 #include "chrome/browser/policy/cloud_policy_controller.h"
 #include "chrome/browser/policy/cloud_policy_data_store.h"
 #include "chrome/browser/policy/device_management_service.h"
 #include "chrome/browser/policy/device_token_fetcher.h"
 #include "chrome/browser/policy/policy_notifier.h"
+#include "chrome/browser/prefs/pref_registrar_simple.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 
 namespace {
 
 // Default refresh rate.
@@ skipping 108 matching lines @@
 
 void CloudPolicySubsystem::RefreshPolicies(bool wait_for_auth_token) {
   data_store_->set_policy_fetching_enabled(true);
   if (cloud_policy_controller_.get())
     cloud_policy_controller_->RefreshPolicies(wait_for_auth_token);
   // Make sure the |device_management_service_| is rolling.
   device_management_service_->ScheduleInitialization(0);
 }
 
 // static
-void CloudPolicySubsystem::RegisterPrefs(PrefServiceSimple* pref_service) {
+void CloudPolicySubsystem::RegisterPrefs(PrefRegistrarSimple* pref_service) {
   pref_service->RegisterIntegerPref(prefs::kDevicePolicyRefreshRate,
                                     kDefaultPolicyRefreshRateMs);
   pref_service->RegisterIntegerPref(prefs::kUserPolicyRefreshRate,
                                     kDefaultPolicyRefreshRateMs);
 }
 
 void CloudPolicySubsystem::UpdatePolicyRefreshRate(int64 refresh_rate) {
   if (cloud_policy_controller_.get()) {
     // Clamp to sane values.
     refresh_rate = std::max(kPolicyRefreshRateMinMs, refresh_rate);
@@ skipping 35 matching lines @@
 CloudPolicyCacheBase* CloudPolicySubsystem::GetCloudPolicyCacheBase() const {
   return cloud_policy_cache_.get();
 }
 
 CloudPolicySubsystem::CloudPolicySubsystem()
     : refresh_pref_name_(NULL),
       data_store_(NULL) {
 }
 
 }  // namespace policy