| Index: chrome/browser/extensions/extension_service_unittest.cc
|
| diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc
|
| index 86e9ecd92268a5e3320023f8103f6367e2806965..804d956c651a4b0c063b0e517fd662fc92bd587d 100644
|
| --- a/chrome/browser/extensions/extension_service_unittest.cc
|
| +++ b/chrome/browser/extensions/extension_service_unittest.cc
|
| @@ -56,7 +56,9 @@
|
| #include "chrome/browser/extensions/updater/extension_updater.h"
|
| #include "chrome/browser/plugins/plugin_prefs_factory.h"
|
| #include "chrome/browser/prefs/browser_prefs.h"
|
| +#include "chrome/browser/prefs/pref_registry_syncable.h"
|
| #include "chrome/browser/prefs/pref_service_mock_builder.h"
|
| +#include "chrome/browser/prefs/pref_service_syncable.h"
|
| #include "chrome/browser/prefs/scoped_user_pref_update.h"
|
| #include "chrome/common/chrome_constants.h"
|
| #include "chrome/common/chrome_notification_types.h"
|
| @@ -444,9 +446,10 @@ void ExtensionServiceTestBase::InitializeExtensionService(
|
| PrefServiceMockBuilder builder;
|
| builder.WithUserFilePrefs(
|
| pref_file, loop_.message_loop_proxy());
|
| - scoped_ptr<PrefServiceSyncable> prefs(builder.CreateSyncable());
|
| - Profile::RegisterUserPrefs(prefs.get());
|
| - chrome::RegisterUserPrefs(prefs.get());
|
| + scoped_refptr<PrefRegistrySyncable> registry(new PrefRegistrySyncable);
|
| + scoped_ptr<PrefServiceSyncable> prefs(builder.CreateSyncable(registry));
|
| + Profile::RegisterUserPrefs(registry);
|
| + chrome::RegisterUserPrefs(prefs.get(), registry);
|
| profile_builder.SetPrefService(prefs.Pass());
|
| profile_builder.SetPath(profile_path);
|
| profile_ = profile_builder.Build();
|
|
|