| Index: chrome/browser/browser_process_impl.cc
|
| diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
|
| index ec8b40002e67c1b193d72c6c0408c48d070a2337..7ceb5ca9d932b28e60ee3d4b353369b0511e9fd7 100644
|
| --- a/chrome/browser/browser_process_impl.cc
|
| +++ b/chrome/browser/browser_process_impl.cc
|
| @@ -802,6 +802,10 @@ void BrowserProcessImpl::CreateLocalState() {
|
| base::FilePath local_state_path;
|
| CHECK(PathService::Get(chrome::FILE_LOCAL_STATE, &local_state_path));
|
| scoped_refptr<PrefRegistrySimple> pref_registry = new PrefRegistrySimple;
|
| +
|
| + // Register local state preferences.
|
| + chrome::RegisterLocalState(pref_registry);
|
| +
|
| local_state_.reset(
|
| chrome_prefs::CreateLocalState(local_state_path,
|
| local_state_task_runner_,
|
| @@ -810,13 +814,6 @@ void BrowserProcessImpl::CreateLocalState() {
|
| pref_registry,
|
| false));
|
|
|
| - // Initialize the prefs of the local state.
|
| - //
|
| - // TODO(joi): Once we clean up so none of the registration methods
|
| - // need the PrefService pointer, this should happen before the call
|
| - // to CreateLocalState.
|
| - chrome::RegisterLocalState(local_state_.get(), pref_registry);
|
| -
|
| pref_change_registrar_.Init(local_state_.get());
|
|
|
| // Initialize the notification for the default browser setting policy.
|
|
|