diff options
| author | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-20 20:55:17 +0000 |
|---|---|---|
| committer | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-20 20:55:17 +0000 |
| commit | 2447640cc25951a7522c0b655f3482ca9cc1c27b (patch) | |
| tree | d54947c9fb370362b387ade837869eceb2d9ad2f /net/proxy/proxy_resolver_winhttp.cc | |
| parent | 28900505e2304ff77769f8fce09b575eab33fc85 (diff) | |
| download | chromium_src-2447640cc25951a7522c0b655f3482ca9cc1c27b.zip chromium_src-2447640cc25951a7522c0b655f3482ca9cc1c27b.tar.gz chromium_src-2447640cc25951a7522c0b655f3482ca9cc1c27b.tar.bz2 | |
Reference-count the data used by PAC scripts, so it is shared between threads.
BUG=49396
Review URL: http://codereview.chromium.org/2836060
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53095 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy/proxy_resolver_winhttp.cc')
| -rw-r--r-- | net/proxy/proxy_resolver_winhttp.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/net/proxy/proxy_resolver_winhttp.cc b/net/proxy/proxy_resolver_winhttp.cc index 9715f02..d7aaae3 100644 --- a/net/proxy/proxy_resolver_winhttp.cc +++ b/net/proxy/proxy_resolver_winhttp.cc @@ -140,10 +140,14 @@ void ProxyResolverWinHttp::CancelRequest(RequestHandle request) { NOTREACHED(); } -int ProxyResolverWinHttp::SetPacScript(const GURL& pac_url, - const string16& /*pac_script*/, - CompletionCallback* /*callback*/) { - pac_url_ = pac_url.is_valid() ? pac_url : GURL("http://wpad/wpad.dat"); +int ProxyResolverWinHttp::SetPacScript( + const scoped_refptr<ProxyResolverScriptData>& script_data, + CompletionCallback* /*callback*/) { + if (script_data->type() == ProxyResolverScriptData::TYPE_AUTO_DETECT) { + pac_url_ = GURL("http://wpad/wpad.dat"); + } else { + pac_url_ = script_data->url(); + } return OK; } |