diff options
| author | kuan@chromium.org <kuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-16 21:32:34 +0000 |
|---|---|---|
| committer | kuan@chromium.org <kuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-16 21:32:34 +0000 |
| commit | add3fbf319fc674d5f1a9764803ee7fefceba0f6 (patch) | |
| tree | da0db7c88c9471eb374d84b7e2436efc876959a1 /chrome/browser/net | |
| parent | 127dd58a7dae9f8492bb2426ce190d7d2c9ca1d7 (diff) | |
| download | chromium_src-add3fbf319fc674d5f1a9764803ee7fefceba0f6.zip chromium_src-add3fbf319fc674d5f1a9764803ee7fefceba0f6.tar.gz chromium_src-add3fbf319fc674d5f1a9764803ee7fefceba0f6.tar.bz2 | |
chromeos: fix crash when freeing ProxyService in LibCrosServiecLibrary.
It was wrong to store ProxyService in a singleton, because the former must live
and die on the IO thread, whereas a singleton dies on the UI thread. Instead,
get access to ProxyService as and when proxy resolution service is requested.
BUG=chromium-os:13077
TEST=verify crash doesn't happen.
Review URL: http://codereview.chromium.org/6677046
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78436 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/net')
| -rw-r--r-- | chrome/browser/net/proxy_service_factory.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/browser/net/proxy_service_factory.cc b/chrome/browser/net/proxy_service_factory.cc index bc74d71..8a34ea9 100644 --- a/chrome/browser/net/proxy_service_factory.cc +++ b/chrome/browser/net/proxy_service_factory.cc @@ -98,8 +98,7 @@ net::ProxyService* ProxyServiceFactory::CreateProxyService( #if defined(OS_CHROMEOS) if (chromeos::CrosLibrary::Get()->EnsureLoaded()) { - chromeos::CrosLibrary::Get()->GetLibCrosServiceLibrary()-> - RegisterNetworkProxyHandler(proxy_service); + chromeos::CrosLibrary::Get()->GetLibCrosServiceLibrary()->StartService(); } #endif // defined(OS_CHROMEOS) |