| Index: chrome/browser/prefs/browser_prefs.cc
|
| diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
|
| index dac9cced7768f0594dc5a01256095d0cb1d7e4bb..c7a3dcee6e197c1653331e15d3a8cacb1f8d60d6 100644
|
| --- a/chrome/browser/prefs/browser_prefs.cc
|
| +++ b/chrome/browser/prefs/browser_prefs.cc
|
| @@ -258,18 +258,14 @@ void RegisterLocalState(PrefRegistrySimple* 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) {
|
| // User prefs. Please keep this list alphabetized.
|
| AlternateErrorPageTabObserver::RegisterUserPrefs(registry);
|
| autofill::AutofillDialogControllerImpl::RegisterUserPrefs(registry);
|
| AutofillManager::RegisterUserPrefs(registry);
|
| BookmarkPromptPrefs::RegisterUserPrefs(registry);
|
| bookmark_utils::RegisterUserPrefs(registry);
|
| - BrowserInstantController::RegisterUserPrefs(user_prefs, registry);
|
| + BrowserInstantController::RegisterUserPrefs(registry);
|
| browser_sync::SyncPrefs::RegisterUserPrefs(registry);
|
| ChromeContentBrowserClient::RegisterUserPrefs(registry);
|
| ChromeDownloadManagerDelegate::RegisterUserPrefs(registry);
|
|
|