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_service_simple.h"
+#include "chrome/browser/prefs/pref_registry_simple.h"
+#include "chrome/browser/prefs/pref_service.h"

[Mattias Nissler (ping if slow), 2013/01/31 14:50:45]

required?

[Jói, 2013/01/31 16:23:37]

Done.

 #include "chrome/browser/prefs/pref_service_syncable.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/notification_service.h"
 #include "googleurl/src/gurl.h"
 
 namespace {
 
@@ skipping 30 matching lines @@
   return CommandLine::ForCurrentProcess()->HasSwitch(switches::kPromoServerURL);
 }
 
 int GetCacheUpdateDelay() {
   return IsTest() ? kTestCacheUpdateDelay : kCacheUpdateDelay;
 }
 
 }  // namespace
 
 // static
-void PromoResourceService::RegisterPrefs(PrefServiceSimple* local_state) {
-  local_state->RegisterStringPref(prefs::kNtpPromoResourceCacheUpdate, "0");
-  NotificationPromo::RegisterPrefs(local_state);
+void PromoResourceService::RegisterPrefs(PrefRegistrySimple* registry) {
+  registry->RegisterStringPref(prefs::kNtpPromoResourceCacheUpdate, "0");
+  NotificationPromo::RegisterPrefs(registry);
 }
 
 // static
 void PromoResourceService::RegisterUserPrefs(PrefServiceSyncable* prefs) {
   // TODO(dbeam): remove in M28 when all prefs have been cleared.
   // http://crbug.com/168887
   prefs->RegisterStringPref(prefs::kNtpPromoResourceCacheUpdate,
                             "0",
                             PrefServiceSyncable::UNSYNCABLE_PREF);
   prefs->ClearPref(prefs::kNtpPromoResourceCacheUpdate);
@@ skipping 84 matching lines @@
 }
 
 void PromoResourceService::Unpack(const DictionaryValue& parsed_json) {
   for (size_t i = 0; i < arraysize(kValidPromoTypes); ++i) {
     NotificationPromo notification_promo;
     notification_promo.InitFromJson(parsed_json, kValidPromoTypes[i]);
     if (notification_promo.new_notification())
       ScheduleNotification(notification_promo);
   }
 }