Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

chrome/browser/web_resource/promo_resource_service.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/web_resource/promo_resource_service.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/prefs/pref_registrar_simple.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/web_resource/notification_promo.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "googleurl/src/gurl.h"
 
@@ skipping 32 matching lines @@
   return CommandLine::ForCurrentProcess()->HasSwitch(switches::kPromoServerURL);
 }
 
 int GetCacheUpdateDelay() {
   return IsTest() ? kTestCacheUpdateDelay : kCacheUpdateDelay;
 }
 
 }  // namespace
 
 // static
-void PromoResourceService::RegisterPrefs(PrefServiceSimple* local_state) {
+void PromoResourceService::RegisterPrefs(PrefService* local_state,
+                                         PrefRegistrarSimple* registrar) {
   // TODO(achuith): Delete this in M26. http://crbug.com/143773
   // The promo service version number, and last locale.
   const char kNtpPromoVersion[] = "ntp.promo_version";
   const char kNtpPromoLocale[] = "ntp.promo_locale";
-  local_state->RegisterIntegerPref(kNtpPromoVersion, 0);
-  local_state->RegisterStringPref(kNtpPromoLocale, std::string());
+  registrar->RegisterIntegerPref(kNtpPromoVersion, 0);
+  registrar->RegisterStringPref(kNtpPromoLocale, std::string());
   local_state->ClearPref(kNtpPromoVersion);
   local_state->ClearPref(kNtpPromoLocale);
 }
 
 // static
 void PromoResourceService::RegisterUserPrefs(PrefServiceSyncable* prefs) {
   prefs->RegisterStringPref(prefs::kNtpPromoResourceCacheUpdate,
                             "0",
                             PrefServiceSyncable::UNSYNCABLE_PREF);
   NotificationPromo::RegisterUserPrefs(prefs);
@@ skipping 84 matching lines @@
 }
 
 void PromoResourceService::Unpack(const DictionaryValue& parsed_json) {
   for (size_t i = 0; i < arraysize(kValidPromoTypes); ++i) {
     NotificationPromo notification_promo(profile_);
     notification_promo.InitFromJson(parsed_json, kValidPromoTypes[i]);
     if (notification_promo.new_notification())
       ScheduleNotification(notification_promo);
   }
 }