chrome/test/base/testing_profile.cc - Issue 18112018: Cleanup the UseSharedProxies preference.

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 18112018: Cleanup the UseSharedProxies preference. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Added a missing member initializer. Created 7 years, 5 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.cc

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

index d5218609b49a2e1ff467212bda8b3060d8f48110..13d06904e6a73c140d4b9b4fc50d59ce6dccddbe 100644

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

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

@@ -720,8 +720,10 @@ void TestingProfile::set_last_selected_directory(const base::FilePath& path) {

PrefProxyConfigTracker* TestingProfile::GetProxyConfigTracker() {

if (!pref_proxy_config_tracker_.get()) {

+ // TestingProfile is used in unit tests, where local state is not available.

pref_proxy_config_tracker_.reset(

- ProxyServiceFactory::CreatePrefProxyConfigTracker(GetPrefs()));

+ ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile(GetPrefs(),

+ NULL));

}

return pref_proxy_config_tracker_.get();

}