Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

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_registry_simple.h"
-#include "chrome/browser/prefs/pref_service_syncable.h"
+#include "chrome/browser/prefs/pref_registry_syncable.h"
+#include "chrome/browser/prefs/pref_service.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 {
 
 // Delay on first fetch so we don't interfere with startup.
@@ skipping 35 matching lines @@
 
 }  // namespace
 
 // static
 void PromoResourceService::RegisterPrefs(PrefRegistrySimple* registry) {
   registry->RegisterStringPref(prefs::kNtpPromoResourceCacheUpdate, "0");
   NotificationPromo::RegisterPrefs(registry);
 }
 
 // static
-void PromoResourceService::RegisterUserPrefs(PrefServiceSyncable* prefs) {
+void PromoResourceService::RegisterUserPrefs(PrefService* prefs,
+                                             PrefRegistrySyncable* registry) {
   // TODO(dbeam): remove in M28 when all prefs have been cleared.
   // http://crbug.com/168887
-  prefs->RegisterStringPref(prefs::kNtpPromoResourceCacheUpdate,
-                            "0",
-                            PrefServiceSyncable::UNSYNCABLE_PREF);
+  registry->RegisterStringPref(prefs::kNtpPromoResourceCacheUpdate,
+                               "0",
+                               PrefRegistrySyncable::UNSYNCABLE_PREF);
   prefs->ClearPref(prefs::kNtpPromoResourceCacheUpdate);

[Mattias Nissler (ping if slow), 2013/02/06 17:53:33]

TODO: move to migration code.

[Jói, 2013/02/07 14:52:32]

Done.

-  NotificationPromo::RegisterUserPrefs(prefs);
+  NotificationPromo::RegisterUserPrefs(prefs, registry);
 }
 
 PromoResourceService::PromoResourceService()
     : WebResourceService(g_browser_process->local_state(),
                          GetPromoResourceURL(),
                          true,  // append locale to URL
                          prefs::kNtpPromoResourceCacheUpdate,
                          kStartResourceFetchDelay,
                          GetCacheUpdateDelay()),
                          ALLOW_THIS_IN_INITIALIZER_LIST(
@@ skipping 73 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);
   }
 }