Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(149)

Unified Diff: chrome/browser/extensions/extension_service_unittest.cc

Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: One more merge to head. Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 2589d40e2ec9ffb9c701a71514fc6a3ceeb0c591..a6f29e0319684119fab568ffe84626039d2ab78e 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"
@@ -442,9 +444,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();

Powered by Google App Engine
This is Rietveld 408576698