| Index: chrome/browser/prefs/browser_prefs.cc
|
| diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
|
| index b8c81a8666683efb9cbf334293318c0f882d49b6..e2385bbefb2649cdfbbaae4bded29a79b19b3a22 100644
|
| --- a/chrome/browser/prefs/browser_prefs.cc
|
| +++ b/chrome/browser/prefs/browser_prefs.cc
|
| @@ -255,18 +255,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);
|
|
|