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

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

Issue 10912132: Move ProxyConfigService construction onto the IO thread. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove extra blank line Created 8 years, 2 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 2cdd496bbf8a63df70e42e7bc103b1c5b9c3277d..9842fcbc89dcf0d72983092b172ca4ca7d9fca77 100644
--- a/chrome/browser/net/proxy_service_factory.cc
+++ b/chrome/browser/net/proxy_service_factory.cc
@@ -29,9 +29,7 @@ using content::BrowserThread;
// static
ChromeProxyConfigService* ProxyServiceFactory::CreateProxyConfigService(
bool wait_for_first_update) {
- // The linux gconf-based proxy settings getter relies on being initialized
- // from the UI thread.
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
net::ProxyConfigService* base_service = NULL;
@@ -48,7 +46,7 @@ ChromeProxyConfigService* ProxyServiceFactory::CreateProxyConfigService(
// that code be moved to chrome/browser instead of being in net, so that it
// can use BrowserThread instead of raw MessageLoop pointers? See bug 25354.
base_service = net::ProxyService::CreateSystemProxyConfigService(
- BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO),
+ BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
BrowserThread::UnsafeGetMessageLoopForThread(BrowserThread::FILE));
#endif // !defined(OS_CHROMEOS)

Powered by Google App Engine
This is Rietveld 408576698