Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

chrome/browser/component_updater/recovery_component_installer.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/component_updater/recovery_component_installer.h"
 
 #include "base/base_paths.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/component_updater/component_updater_service.h"
+#include "chrome/browser/prefs/pref_registry_simple.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
 
 namespace {
 
 // CRX hash. The extension id is: npdjjkjlcidkjlamlmmdelcjbcpdjocm.
@@ skipping 25 matching lines @@
 
   virtual bool Install(base::DictionaryValue* manifest,
                        const FilePath& unpack_path) OVERRIDE;
 
  private:
   Version current_version_;
   PrefService* prefs_;
 };
 
 void RecoveryRegisterHelper(ComponentUpdateService* cus,
-                            PrefServiceSimple* prefs) {
+                            PrefService* prefs) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   // TODO(joi): Registrations for local state prefs shouldn't happen
   // like this, they should be done via
   // browser_prefs::RegisterLocalState.
-  prefs->RegisterStringPref(prefs::kRecoveryComponentVersion, "0.0.0.0");
+  static_cast<PrefRegistrySimple*>(
+      prefs->DeprecatedGetPrefRegistry())->RegisterStringPref(
+          prefs::kRecoveryComponentVersion, "0.0.0.0");
   Version version(prefs->GetString(prefs::kRecoveryComponentVersion));
   if (!version.IsValid()) {
     NOTREACHED();
     return;
   }
 
   CrxComponent recovery;
   recovery.name = "recovery";
   recovery.installer = new RecoveryComponentInstaller(version, prefs);
   recovery.version = version;
@@ skipping 47 matching lines @@
   }
   current_version_ = version;
   if (prefs_) {
     BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
         base::Bind(&RecoveryUpdateVersionHelper, version, prefs_));
   }
   return base::LaunchProcess(cmdline, base::LaunchOptions(), NULL);
 }
 
 void RegisterRecoveryComponent(ComponentUpdateService* cus,
-                               PrefServiceSimple* prefs) {
+                               PrefService* prefs) {
 #if !defined(OS_CHROMEOS)
   // We delay execute the registration because we are not required in
   // the critical path during browser startup.
   BrowserThread::PostDelayedTask(
       BrowserThread::UI,
       FROM_HERE,
       base::Bind(&RecoveryRegisterHelper, cus, prefs),
       base::TimeDelta::FromSeconds(6));
 #endif
 }