chrome/test/base/testing_profile.h - 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/test/base/testing_profile.h

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/test/base/testing_profile.h

diff --git a/chrome/test/base/testing_profile.h b/chrome/test/base/testing_profile.h

index 23302ac7f1879777b4c5cef6c645aae24a2698cc..8e857ebd2ffa1c9ec7682ac0e81d60c414bbf2ad 100644

--- a/chrome/test/base/testing_profile.h

+++ b/chrome/test/base/testing_profile.h

@@ -237,7 +237,7 @@ class TestingProfile : public Profile {

// to set a pref service you must invoke this before GetPrefs.

// TestingPrefService takes ownership of |prefs|.

void SetPrefService(PrefServiceSyncable* prefs);

- virtual PrefServiceSyncable* GetPrefs() OVERRIDE;

+ virtual PrefService* GetPrefs() OVERRIDE;

virtual history::TopSites* GetTopSites() OVERRIDE;

virtual history::TopSites* GetTopSitesWithoutCreating() OVERRIDE;

@@ -315,7 +315,7 @@ class TestingProfile : public Profile {

const base::Closure& completion) OVERRIDE;

virtual GURL GetHomePage() OVERRIDE;

- virtual PrefServiceSyncable* GetOffTheRecordPrefs() OVERRIDE;

+ virtual PrefService* GetOffTheRecordPrefs() OVERRIDE;

protected:

base::Time start_time_;

« no previous file with comments | « chrome/test/base/testing_pref_service.cc ('k') | chrome/test/base/testing_profile.cc » ('j') | no next file with comments »