diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/proxy/proxy_resolver_js_bindings_unittest.cc | 2 | ||||
-rw-r--r-- | net/proxy/proxy_resolver_request_context.h | 7 | ||||
-rw-r--r-- | net/proxy/proxy_resolver_v8.cc | 3 |
3 files changed, 4 insertions, 8 deletions
diff --git a/net/proxy/proxy_resolver_js_bindings_unittest.cc b/net/proxy/proxy_resolver_js_bindings_unittest.cc index df30a29..2559039 100644 --- a/net/proxy/proxy_resolver_js_bindings_unittest.cc +++ b/net/proxy/proxy_resolver_js_bindings_unittest.cc @@ -259,7 +259,7 @@ TEST(ProxyResolverJSBindingsTest, PerRequestDNSCache) { HostCache cache(50, base::TimeDelta::FromMinutes(10), base::TimeDelta::FromMinutes(10)); - ProxyResolverRequestContext context(NULL, NULL, &cache); + ProxyResolverRequestContext context(NULL, &cache); bindings->set_current_request_context(&context); EXPECT_FALSE(bindings->DnsResolve("foo", &ip_address)); diff --git a/net/proxy/proxy_resolver_request_context.h b/net/proxy/proxy_resolver_request_context.h index 750ce10..fdcced1 100644 --- a/net/proxy/proxy_resolver_request_context.h +++ b/net/proxy/proxy_resolver_request_context.h @@ -16,15 +16,12 @@ class BoundNetLog; struct ProxyResolverRequestContext { // All of these pointers are expected to remain valid for duration of // this instance's lifetime. - ProxyResolverRequestContext(const GURL* query_url, - const BoundNetLog* net_log, + ProxyResolverRequestContext(const BoundNetLog* net_log, HostCache* host_cache) - : query_url(query_url), - net_log(net_log), + : net_log(net_log), host_cache(host_cache) { } - const GURL* query_url; const BoundNetLog* net_log; HostCache* host_cache; }; diff --git a/net/proxy/proxy_resolver_v8.cc b/net/proxy/proxy_resolver_v8.cc index b17ba4a..05f16e9 100644 --- a/net/proxy/proxy_resolver_v8.cc +++ b/net/proxy/proxy_resolver_v8.cc @@ -501,8 +501,7 @@ int ProxyResolverV8::GetProxyForURL(const GURL& query_url, base::TimeDelta::FromMinutes(5), base::TimeDelta::FromMinutes(5)); - ProxyResolverRequestContext request_context( - &query_url, &net_log, &host_cache); + ProxyResolverRequestContext request_context(&net_log, &host_cache); // Otherwise call into V8. context_->SetCurrentRequestContext(&request_context); |