Fix prefs registration in promo code.

chrome/browser/prefs/browser_prefs.cc

 // Copyright 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/prefs/browser_prefs.h"
 
 #include "apps/prefs.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/about_flags.h"
@@ skipping 275 matching lines @@
   InstantUI::RegisterUserPrefs(registry);
   browser_sync::InvalidatorStorage::RegisterUserPrefs(registry);
   MediaCaptureDevicesDispatcher::RegisterUserPrefs(registry);
   MediaStreamDevicesController::RegisterUserPrefs(registry);
   NetPrefObserver::RegisterUserPrefs(registry);
   NewTabUI::RegisterUserPrefs(registry);
   PasswordManager::RegisterUserPrefs(registry);
   PrefProxyConfigTrackerImpl::RegisterUserPrefs(registry);
   PrefsTabHelper::RegisterUserPrefs(registry);
   ProfileImpl::RegisterUserPrefs(registry);
-  PromoResourceService::RegisterUserPrefs(user_prefs, registry);
+  PromoResourceService::RegisterUserPrefs(registry);
   ProtocolHandlerRegistry::RegisterUserPrefs(registry);
   RegisterBrowserUserPrefs(registry);
   SessionStartupPref::RegisterUserPrefs(registry);
   TemplateURLPrepopulateData::RegisterUserPrefs(registry);
   TranslatePrefs::RegisterUserPrefs(user_prefs, registry);
 
 #if defined(ENABLE_CONFIGURATION_POLICY)
   policy::URLBlacklistManager::RegisterUserPrefs(registry);
 #endif
 
@@ skipping 55 matching lines @@
                                    PrefRegistrySyncable::UNSYNCABLE_PREF);
 }
 
 void MigrateUserPrefs(Profile* profile) {
   PrefService* prefs = profile->GetPrefs();
 
   // Cleanup prefs from now-removed protector feature.
   prefs->ClearPref(kBackupPref);
 
   PrefsTabHelper::MigrateUserPrefs(prefs);
+  PromoResourceService::MigrateUserPrefs(prefs);
 }
 
 void MigrateBrowserPrefs(Profile* profile, PrefService* local_state) {
   // Copy pref values which have been migrated to user_prefs from local_state,
   // or remove them from local_state outright, if copying is not required.
   int current_version =
       local_state->GetInteger(prefs::kMultipleProfilePrefMigration);
   PrefRegistrySimple* registry = static_cast<PrefRegistrySimple*>(
       local_state->DeprecatedGetPrefRegistry());
 
@@ skipping 53 matching lines @@
     }
     local_state->ClearPref(prefs::kLastPromptedGoogleURL);
 
     current_version |= GOOGLE_URL_TRACKER_PREFS;
     local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
                             current_version);
   }
 }
 
 }  // namespace chrome