diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-05-24 16:24:13 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-05-25 14:13:32 +0100 |
| commit | 3f50c38dc070f4bb515c1b64450dae14f316474e (patch) | |
| tree | 29f309f9534e05c47244eedb438fc612578d133b /net/proxy/proxy_script_fetcher_impl_unittest.cc | |
| parent | e23bef148f7be2bdf9c3cb2cd3aa5ceebf1190fb (diff) | |
| download | external_chromium-3f50c38dc070f4bb515c1b64450dae14f316474e.zip external_chromium-3f50c38dc070f4bb515c1b64450dae14f316474e.tar.gz external_chromium-3f50c38dc070f4bb515c1b64450dae14f316474e.tar.bz2 | |
Merge Chromium at r10.0.634.0: Initial merge by git.
Change-Id: Iac2af492818d119bcc2562eb5fdabf5ab0b6df9c
Diffstat (limited to 'net/proxy/proxy_script_fetcher_impl_unittest.cc')
| -rw-r--r-- | net/proxy/proxy_script_fetcher_impl_unittest.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/proxy/proxy_script_fetcher_impl_unittest.cc b/net/proxy/proxy_script_fetcher_impl_unittest.cc index ec0fb58..043f71e 100644 --- a/net/proxy/proxy_script_fetcher_impl_unittest.cc +++ b/net/proxy/proxy_script_fetcher_impl_unittest.cc @@ -47,6 +47,7 @@ class RequestContext : public URLRequestContext { net::HttpNetworkLayer::CreateFactory(host_resolver_, cert_verifier_, NULL, NULL, NULL, proxy_service_, ssl_config_service_, NULL, NULL, NULL), + NULL, net::HttpCache::DefaultBackend::InMemory(0)); } |