Fix prefs registration in SyncPrefs.

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 238 matching lines @@
 
 #if defined(OS_MACOSX)
   confirm_quit::RegisterLocalState(registry);
 #endif
 
 #if defined(ENABLE_SETTINGS_APP)
   chrome::RegisterAppListPrefs(registry);
 #endif
 }
 
-void RegisterUserPrefs(PrefService* user_prefs,
-                       PrefRegistrySyncable* registry) {
-  // TODO(joi): Get rid of the need for the PrefService parameter, and
-  // do registration prior to PrefService creation.
-
+void RegisterUserPrefs(PrefRegistrySyncable* registry) {

[Mattias Nissler (ping if slow), 2013/02/22 15:44:32]

w00t!

[Jói, 2013/02/22 16:08:07]

Indeed :)

   // User prefs. Please keep this list alphabetized.
   AlternateErrorPageTabObserver::RegisterUserPrefs(registry);
   AutofillManager::RegisterUserPrefs(registry);
   BookmarkPromptPrefs::RegisterUserPrefs(registry);
   bookmark_utils::RegisterUserPrefs(registry);
   BrowserInstantController::RegisterUserPrefs(registry);
-  browser_sync::SyncPrefs::RegisterUserPrefs(user_prefs, registry);
+  browser_sync::SyncPrefs::RegisterUserPrefs(registry);
   ChromeContentBrowserClient::RegisterUserPrefs(registry);
   ChromeDownloadManagerDelegate::RegisterUserPrefs(registry);
   ChromeVersionService::RegisterUserPrefs(registry);
   chrome_browser_net::HttpServerPropertiesManager::RegisterUserPrefs(
       registry);
   chrome_browser_net::Predictor::RegisterUserPrefs(registry);
   DownloadPrefs::RegisterUserPrefs(registry);
   extensions::ComponentLoader::RegisterUserPrefs(registry);
   extensions::ExtensionPrefs::RegisterUserPrefs(registry);
   ExtensionWebUI::RegisterUserPrefs(registry);
@@ skipping 154 matching lines @@
     }
     local_state->ClearPref(prefs::kLastPromptedGoogleURL);
 
     current_version |= GOOGLE_URL_TRACKER_PREFS;
     local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
                             current_version);
   }
 }
 
 }  // namespace chrome