diff options
| author | scottbyer@chromium.org <scottbyer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-05 01:52:51 +0000 |
|---|---|---|
| committer | scottbyer@chromium.org <scottbyer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-05 01:52:51 +0000 |
| commit | cfbe0d231b63d3e56a346b9c89df14cc4b289e9b (patch) | |
| tree | 098a429daae641347206dfdd2f4d88b9f2d876c1 /chrome/service/net | |
| parent | 41c6860ea8b051fd6c15e971df83de05a398a400 (diff) | |
| download | chromium_src-cfbe0d231b63d3e56a346b9c89df14cc4b289e9b.zip chromium_src-cfbe0d231b63d3e56a346b9c89df14cc4b289e9b.tar.gz chromium_src-cfbe0d231b63d3e56a346b9c89df14cc4b289e9b.tar.bz2 | |
Service process crash on Windows.
A crash not caught by the service process browser tests, revert the timeline of
creating the proxy service on Windows to what it was previously.
BUG=74992
TEST=enable cloud print proxy on Windows, service doesn't crash withing 5 minutes.
Review URL: http://codereview.chromium.org/6626038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77017 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/service/net')
| -rw-r--r-- | chrome/service/net/service_url_request_context.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/service/net/service_url_request_context.cc b/chrome/service/net/service_url_request_context.cc index 4f12f54..8060ebe 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 |