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

Unified Diff: chrome/browser/profiles/off_the_record_profile_impl_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/profiles/off_the_record_profile_impl_unittest.cc
diff --git a/chrome/browser/profiles/off_the_record_profile_impl_unittest.cc b/chrome/browser/profiles/off_the_record_profile_impl_unittest.cc
index b8572c57ddb74700beea107651abd375612e0173..13bc6828ed03c5388a71d7ad9ccf5960c1f8ef85 100644
--- a/chrome/browser/profiles/off_the_record_profile_impl_unittest.cc
+++ b/chrome/browser/profiles/off_the_record_profile_impl_unittest.cc
@@ -41,7 +41,7 @@ class TestingProfileWithHostZoomMap : public TestingProfile,
return off_the_record_profile_.get();
}
- virtual PrefServiceSyncable* GetOffTheRecordPrefs() OVERRIDE {
+ virtual PrefService* GetOffTheRecordPrefs() OVERRIDE {
return GetPrefs();
}
@@ -87,7 +87,7 @@ class OffTheRecordProfileImplTest : public BrowserWithTestWindowTest {
virtual void SetUp() OVERRIDE {
prefs_.reset(new TestingPrefServiceSimple);
- chrome::RegisterLocalState(prefs_->registry(), prefs_.get());
+ chrome::RegisterLocalState(prefs_.get(), prefs_->registry());
browser_process()->SetLocalState(prefs_.get());

Powered by Google App Engine
This is Rietveld 408576698