diff options
| author | scottbyer@chromium.org <scottbyer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-03 17:35:23 +0000 |
|---|---|---|
| committer | scottbyer@chromium.org <scottbyer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-03 17:35:23 +0000 |
| commit | 234118e27cc5c8f7930dea07c167da3a14f31d85 (patch) | |
| tree | 72fc5a89410643e0e780778f9ac1049576f2a7fb /chrome/chrome_tests.gypi | |
| parent | 642c224f643ddc33f198b6a9096d02d2054c70fe (diff) | |
| download | chromium_src-234118e27cc5c8f7930dea07c167da3a14f31d85.zip chromium_src-234118e27cc5c8f7930dea07c167da3a14f31d85.tar.gz chromium_src-234118e27cc5c8f7930dea07c167da3a14f31d85.tar.bz2 | |
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.
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=76612
Review URL: http://codereview.chromium.org/6602041
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76760 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_tests.gypi')
| -rw-r--r-- | chrome/chrome_tests.gypi | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 651996e..34336a4 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -2342,6 +2342,10 @@ 'browser/ui/webui/file_browse_browsertest.cc', 'browser/ui/webui/mediaplayer_browsertest.cc', ], + }, { #else: OS == "chromeos" + 'sources!': [ + 'browser/service/service_process_control_browsertest.cc', + ], }], ['toolkit_views==0', { 'sources!': [ |