Fix prefs registration in promo code.

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/prefs/pref_registry_simple.h"
@@ skipping 50 matching lines @@
 
 }  // namespace
 
 // static
 void PromoResourceService::RegisterPrefs(PrefRegistrySimple* registry) {
   registry->RegisterStringPref(prefs::kNtpPromoResourceCacheUpdate, "0");
   NotificationPromo::RegisterPrefs(registry);
 }
 
 // static
-void PromoResourceService::RegisterUserPrefs(PrefService* prefs,
-                                             PrefRegistrySyncable* registry) {
-  // TODO(dbeam): remove in M28 when all prefs have been cleared.
-  // http://crbug.com/168887
-  // TODO(joi): Remove PrefService parameter; move this to migration code.
+void PromoResourceService::RegisterUserPrefs(PrefRegistrySyncable* registry) {
+  // TODO(dbeam): This is registered only for migration; remove in M28
+  // when all prefs have been cleared.  http://crbug.com/168887
   registry->RegisterStringPref(prefs::kNtpPromoResourceCacheUpdate,
                                "0",
                                PrefRegistrySyncable::UNSYNCABLE_PREF);
-  prefs->ClearPref(prefs::kNtpPromoResourceCacheUpdate);
-  NotificationPromo::RegisterUserPrefs(prefs, registry);
+  NotificationPromo::RegisterUserPrefs(registry);
+}
+
+// static
+void PromoResourceService::MigrateUserPrefs(PrefService* user_prefs) {
+  user_prefs->ClearPref(prefs::kNtpPromoResourceCacheUpdate);
+  NotificationPromo::MigrateUserPrefs(user_prefs);
 }
 
 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);
   }
 }