| Index: chrome/browser/prefs/chrome_pref_service_factory.cc
|
| diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browser/prefs/chrome_pref_service_factory.cc
|
| index 81b2c6670c8f92deaf05cf5067846753f6acb13f..97722856882041a08795caf4fb051d3c3b14d159 100644
|
| --- a/chrome/browser/prefs/chrome_pref_service_factory.cc
|
| +++ b/chrome/browser/prefs/chrome_pref_service_factory.cc
|
| @@ -25,6 +25,7 @@
|
| #include "base/threading/sequenced_worker_pool.h"
|
| #include "base/time/time.h"
|
| #include "chrome/browser/browser_process.h"
|
| +#include "chrome/browser/prefs/browser_ui_prefs_migrator.h"
|
| #include "chrome/browser/prefs/command_line_pref_store.h"
|
| #include "chrome/browser/prefs/pref_hash_filter.h"
|
| #include "chrome/browser/prefs/pref_model_associator.h"
|
| @@ -463,14 +464,18 @@ scoped_ptr<PrefServiceSyncable> CreateProfilePrefs(
|
| syncer::PREFERENCES);
|
|
|
| PrefServiceSyncableFactory factory;
|
| + scoped_refptr<PersistentPrefStore> user_pref_store(
|
| + CreateProfilePrefStoreManager(profile_path)
|
| + ->CreateProfilePrefStore(pref_io_task_runner,
|
| + start_sync_flare_for_prefs,
|
| + validation_delegate));
|
| + // BrowserUIPrefsMigrator unregisters and deletes itself after it is done.
|
| + user_pref_store->AddObserver(
|
| + new BrowserUIPrefsMigrator(user_pref_store.get()));
|
| PrepareFactory(&factory,
|
| policy_service,
|
| supervised_user_settings,
|
| - scoped_refptr<PersistentPrefStore>(
|
| - CreateProfilePrefStoreManager(profile_path)
|
| - ->CreateProfilePrefStore(pref_io_task_runner,
|
| - start_sync_flare_for_prefs,
|
| - validation_delegate)),
|
| + user_pref_store,
|
| extension_prefs,
|
| async);
|
| scoped_ptr<PrefServiceSyncable> pref_service =
|
|
|