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

Unified Diff: chrome/browser/prefs/scoped_user_pref_update_unittest.cc

Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add to PrefRegistrySyncable and PrefServiceSyncable to let sync know of pre-registered prefs. 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/prefs/scoped_user_pref_update_unittest.cc
diff --git a/chrome/browser/prefs/scoped_user_pref_update_unittest.cc b/chrome/browser/prefs/scoped_user_pref_update_unittest.cc
index 05e9c846a36b382eecf3034cc42798df2a34b5a3..40e4ba50adbf3c44d22233211b531edfcc62afd0 100644
--- a/chrome/browser/prefs/scoped_user_pref_update_unittest.cc
+++ b/chrome/browser/prefs/scoped_user_pref_update_unittest.cc
@@ -4,6 +4,7 @@
#include "base/prefs/public/pref_change_registrar.h"
#include "chrome/browser/prefs/mock_pref_change_callback.h"
+#include "chrome/browser/prefs/pref_registry_syncable.h"
#include "chrome/browser/prefs/scoped_user_pref_update.h"
#include "chrome/test/base/testing_pref_service.h"
#include "testing/gmock/include/gmock/gmock.h"
@@ -19,8 +20,9 @@ class ScopedUserPrefUpdateTest : public testing::Test {
protected:
virtual void SetUp() {
- prefs_.RegisterDictionaryPref(kPref,
- PrefServiceSyncable::UNSYNCABLE_PREF);
+ prefs_.registry()->RegisterDictionaryPref(
+ kPref,
+ PrefRegistrySyncable::UNSYNCABLE_PREF);
registrar_.Init(&prefs_);
registrar_.Add(kPref, observer_.GetCallback());
}

Powered by Google App Engine
This is Rietveld 408576698