chrome/browser/profiles/off_the_record_profile_impl_unittest.cc - Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Merge to head again; base::File changes conflicted. 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:

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 4bd5c2b107e0c4855c6050794f480f81b2c3e2de..ba0a2150adfd198bc8ab491769f758c4d0fcac98 100644

--- a/chrome/browser/profiles/off_the_record_profile_impl_unittest.cc

+++ b/chrome/browser/profiles/off_the_record_profile_impl_unittest.cc

@@ -42,7 +42,7 @@ class TestingProfileWithHostZoomMap : public TestingProfile {

return off_the_record_profile_.get();

}

- virtual PrefServiceSyncable* GetOffTheRecordPrefs() OVERRIDE {

+ virtual PrefService* GetOffTheRecordPrefs() OVERRIDE {

return GetPrefs();

}

@@ -84,7 +84,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());