diff options
| author | scottbyer@chromium.org <scottbyer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-02 22:49:52 +0000 |
|---|---|---|
| committer | scottbyer@chromium.org <scottbyer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-02 22:49:52 +0000 |
| commit | ba2e465d364c573b530c3a14c99c2b377e5f626d (patch) | |
| tree | 6345f9cef85ce55fceaaadbe7a97d2e5b62611b3 /chrome/service/cloud_print | |
| parent | ebe11a5c6f543ed54e7c62c386f8933f954208d8 (diff) | |
| download | chromium_src-ba2e465d364c573b530c3a14c99c2b377e5f626d.zip chromium_src-ba2e465d364c573b530c3a14c99c2b377e5f626d.tar.gz chromium_src-ba2e465d364c573b530c3a14c99c2b377e5f626d.tar.bz2 | |
Revert 76612 - Service process fixes for Linux.
Linux requires that the proxy_config_service be created on the I/O
thread. Fortunately, ServiceURLRequestContextGetter was already thread safe ref
counted, so we lift creation of that and the (also, fortunately) thread safe
ref counted net::ProxyService up to service process initialization time. That
created proxy service now gets passed in to the dynamic creation of the
ServiceURLRequestContexts. Should have no effect on other platforms.
BUG=74226
TEST=Start Chromium on Linux with --enable-cloud-print-proxy, sign in, and examine ~/.config/chromium/Service State. With the fix, Service State properly contains the needed tokens to properly re-launch and be a proxy.
Review URL: http://codereview.chromium.org/6602041
TBR=scottbyer@chromium.org
Review URL: http://codereview.chromium.org/6606022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76638 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/service/cloud_print')
| -rw-r--r-- | chrome/service/cloud_print/cloud_print_url_fetcher.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/service/cloud_print/cloud_print_url_fetcher.cc b/chrome/service/cloud_print/cloud_print_url_fetcher.cc index 1482b50..0d81e17 100644 --- a/chrome/service/cloud_print/cloud_print_url_fetcher.cc +++ b/chrome/service/cloud_print/cloud_print_url_fetcher.cc @@ -10,7 +10,6 @@ #include "chrome/service/cloud_print/cloud_print_consts.h" #include "chrome/service/cloud_print/cloud_print_helpers.h" #include "chrome/service/net/service_url_request_context.h" -#include "chrome/service/service_process.h" #include "googleurl/src/gurl.h" #include "net/url_request/url_request_status.h" @@ -146,10 +145,11 @@ CloudPrintURLFetcher::~CloudPrintURLFetcher() {} URLRequestContextGetter* CloudPrintURLFetcher::GetRequestContextGetter() { ServiceURLRequestContextGetter* getter = - g_service_process->GetServiceURLRequestContextGetter(); + new ServiceURLRequestContextGetter(); // Now set up the user agent for cloudprint. std::string user_agent = getter->user_agent(); base::StringAppendF(&user_agent, " %s", kCloudPrintUserAgent); getter->set_user_agent(user_agent); return getter; } + |