Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(261)

Unified Diff: net/proxy/proxy_service.cc

Issue 6831025: Adds support for the DHCP portion of the WPAD (proxy auto-discovery) protocol. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add timeout on Win32 DHCP API. Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/proxy/proxy_service.cc
diff --git a/net/proxy/proxy_service.cc b/net/proxy/proxy_service.cc
index ca3629ebcdcdb6361921b2daf14d0b1bd7acd984..98e0e834922ffd3848e1fc9e05702100a737c2f6 100644
--- a/net/proxy/proxy_service.cc
+++ b/net/proxy/proxy_service.cc
@@ -393,7 +393,7 @@ ProxyService::ProxyService(ProxyConfigService* config_service,
ProxyService* ProxyService::CreateUsingV8ProxyResolver(
ProxyConfigService* proxy_config_service,
size_t num_pac_threads,
- ProxyScriptFetcher* proxy_script_fetcher,
+ URLProxyScriptFetcher* proxy_script_fetcher,
HostResolver* host_resolver,
NetLog* net_log) {
DCHECK(proxy_config_service);
@@ -739,7 +739,7 @@ int ProxyService::DidFinishResolvingProxy(ProxyInfo* result,
}
void ProxyService::SetProxyScriptFetcher(
- ProxyScriptFetcher* proxy_script_fetcher) {
+ URLProxyScriptFetcher* proxy_script_fetcher) {
DCHECK(CalledOnValidThread());
State previous_state = ResetProxyConfig(false);
proxy_script_fetcher_.reset(proxy_script_fetcher);
@@ -747,7 +747,7 @@ void ProxyService::SetProxyScriptFetcher(
ApplyProxyConfigIfAvailable();
}
-ProxyScriptFetcher* ProxyService::GetProxyScriptFetcher() const {
+URLProxyScriptFetcher* ProxyService::GetProxyScriptFetcher() const {
DCHECK(CalledOnValidThread());
return proxy_script_fetcher_.get();
}

Powered by Google App Engine
This is Rietveld 408576698