summaryrefslogtreecommitdiffstats
path: root/net/http
diff options
context:
space:
mode:
authoreroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-20 20:55:17 +0000
committereroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-20 20:55:17 +0000
commit2447640cc25951a7522c0b655f3482ca9cc1c27b (patch)
treed54947c9fb370362b387ade837869eceb2d9ad2f /net/http
parent28900505e2304ff77769f8fce09b575eab33fc85 (diff)
downloadchromium_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/http')
-rw-r--r--net/http/http_network_transaction_unittest.cc9
1 files changed, 4 insertions, 5 deletions
diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc
index f045f1f..03e4b31 100644
--- a/net/http/http_network_transaction_unittest.cc
+++ b/net/http/http_network_transaction_unittest.cc
@@ -5297,15 +5297,14 @@ class CapturingProxyResolver : public ProxyResolver {
NOTREACHED();
}
- const std::vector<GURL>& resolved() const { return resolved_; }
-
- private:
- virtual int SetPacScript(const GURL& /*pac_url*/,
- const string16& /*pac_script*/,
+ virtual int SetPacScript(const scoped_refptr<ProxyResolverScriptData>&,
CompletionCallback* /*callback*/) {
return OK;
}
+ const std::vector<GURL>& resolved() const { return resolved_; }
+
+ private:
std::vector<GURL> resolved_;
DISALLOW_COPY_AND_ASSIGN(CapturingProxyResolver);