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/service_process.cc | |
| 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/service_process.cc')
| -rw-r--r-- | chrome/service/service_process.cc | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/chrome/service/service_process.cc b/chrome/service/service_process.cc index 1335936..6a8b689 100644 --- a/chrome/service/service_process.cc +++ b/chrome/service/service_process.cc @@ -23,7 +23,6 @@ #include "chrome/common/pref_names.h" #include "chrome/common/service_process_util.h" #include "chrome/service/cloud_print/cloud_print_proxy.h" -#include "chrome/service/net/service_url_request_context.h" #include "chrome/service/service_ipc_server.h" #include "chrome/service/service_process_prefs.h" #include "grit/chromium_strings.h" @@ -142,8 +141,6 @@ bool ServiceProcess::Initialize(MessageLoopForUI* message_loop, return false; } - request_context_getter_ = new ServiceURLRequestContextGetter(); - // See if we have been suppiled an LSID in the command line. This LSID will // override the credentials we use for Cloud Print. std::string lsid = command_line.GetSwitchValueASCII( @@ -309,12 +306,6 @@ void ServiceProcess::OnChromotingHostDisabled() { OnServiceDisabled(); } -ServiceURLRequestContextGetter* -ServiceProcess::GetServiceURLRequestContextGetter() { - DCHECK(request_context_getter_.get()); - return request_context_getter_.get(); -} - void ServiceProcess::OnServiceEnabled() { enabled_services_++; if ((1 == enabled_services_) && |