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

Unified Diff: chrome/service/net/service_url_request_context.cc

Issue 6626038: Service process crash on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 10 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/service/net/service_url_request_context.cc
diff --git a/chrome/service/net/service_url_request_context.cc b/chrome/service/net/service_url_request_context.cc
index 4f12f5492f58cedc659a023db52e38fec2849410..8060ebe0ce02f012e7c66a1234a1244e1cecdcb5 100644
--- a/chrome/service/net/service_url_request_context.cc
+++ b/chrome/service/net/service_url_request_context.cc
@@ -157,16 +157,16 @@ ServiceURLRequestContextGetter::ServiceURLRequestContextGetter()
// Build the default user agent.
user_agent_ = MakeUserAgentForServiceProcess();
-#if !defined(OS_MACOSX)
- // Create the proxy service now, at initialization time, on the main thread.
- // The Mac needs it created later, on the I/O thread.
+#if defined(OS_LINUX)
+ // Create the proxy service now, at initialization time, on the main thread,
+ // only for Linux, which requires that.
CreateProxyService();
#endif
}
net::URLRequestContext*
ServiceURLRequestContextGetter::GetURLRequestContext() {
-#if defined(OS_MACOSX)
+#if !defined(OS_LINUX)
if (!proxy_service_)
CreateProxyService();
#endif
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698