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

Unified Diff: chrome/browser/net/proxy_service_factory.cc

Issue 1296663003: Componentize proxy code from chrome/browser/net (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: updating for win p/f Created 5 years, 4 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
Index: chrome/browser/net/proxy_service_factory.cc
diff --git a/chrome/browser/net/proxy_service_factory.cc b/chrome/browser/net/proxy_service_factory.cc
index 7ec1ac30ffbabacfe337518d51228ac58ea12092..12a657c8de00034cf60007c2da95d79781216f73 100644
--- a/chrome/browser/net/proxy_service_factory.cc
+++ b/chrome/browser/net/proxy_service_factory.cc
@@ -12,8 +12,8 @@
#include "base/threading/thread.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/io_thread.h"
-#include "chrome/browser/net/pref_proxy_config_tracker_impl.h"
#include "chrome/common/chrome_switches.h"
+#include "components/proxy_config/pref_proxy_config_tracker_impl.h"
#include "content/public/browser/browser_thread.h"
#include "net/log/net_log.h"
#include "net/proxy/dhcp_proxy_script_fetcher_factory.h"
@@ -94,7 +94,9 @@ ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile(
#if defined(OS_CHROMEOS)
return new chromeos::ProxyConfigServiceImpl(profile_prefs, local_state_prefs);
#else
- return new PrefProxyConfigTrackerImpl(profile_prefs);
+ return new PrefProxyConfigTrackerImpl(
+ profile_prefs,
+ BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO));
#endif // defined(OS_CHROMEOS)
}
@@ -105,7 +107,9 @@ ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState(
#if defined(OS_CHROMEOS)
return new chromeos::ProxyConfigServiceImpl(NULL, local_state_prefs);
#else
- return new PrefProxyConfigTrackerImpl(local_state_prefs);
+ return new PrefProxyConfigTrackerImpl(
+ local_state_prefs,
+ BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO));
#endif // defined(OS_CHROMEOS)
}

Powered by Google App Engine
This is Rietveld 408576698