chrome/test/base/testing_profile.cc - Issue 16625004: components: Move user_prefs into user_prefs namespace.

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.cc

Issue 16625004: components: Move user_prefs into user_prefs namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 7 years, 6 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

« no previous file with comments | « chrome/browser/ui/webui/options/preferences_browsertest.cc ('k') | components/autofill/browser/autocomplete_history_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/test/base/testing_profile.cc

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

index b3ad1cda897d99578681ba7915e5ceb754b1494f..466191ef87ab5d1919fbd92bac2f308e25aac66f 100644

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

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

@@ -288,7 +288,7 @@ void TestingProfile::Init() {

EnsureBrowserContextKeyedServiceFactoriesBuilt();

if (prefs_.get())

- components::UserPrefs::Set(this, prefs_.get());

+ user_prefs::UserPrefs::Set(this, prefs_.get());

else

CreateTestingPrefService();

@@ -559,7 +559,7 @@ void TestingProfile::CreateTestingPrefService() {

DCHECK(!prefs_.get());

testing_prefs_ = new TestingPrefServiceSyncable();

prefs_.reset(testing_prefs_);

- components::UserPrefs::Set(this, prefs_.get());

+ user_prefs::UserPrefs::Set(this, prefs_.get());

chrome::RegisterUserPrefs(testing_prefs_->registry());

}