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

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: Rebased. 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/common/pref_names.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 4536bce8f31fa30c5175fd40a82fdbb934b6332d..e35899875925ed2d5b97e524fe9524cd83d342be 100644
--- a/chrome/test/base/testing_profile.cc
+++ b/chrome/test/base/testing_profile.cc
@@ -729,8 +729,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();
}
« no previous file with comments | « chrome/common/pref_names.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698