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

Unified Diff: chrome/browser/net/proxy_service_factory.cc

Issue 7019015: Revert 85646 - 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: Created 9 years, 7 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
« no previous file with comments | « chrome/browser/net/connection_tester.cc ('k') | chrome/chrome_dll.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/net/proxy_service_factory.cc
===================================================================
--- chrome/browser/net/proxy_service_factory.cc (revision 85647)
+++ chrome/browser/net/proxy_service_factory.cc (working copy)
@@ -12,7 +12,6 @@
#include "chrome/common/chrome_switches.h"
#include "content/browser/browser_thread.h"
#include "net/base/net_log.h"
-#include "net/proxy/dhcp_proxy_script_fetcher_factory.h"
#include "net/proxy/proxy_config_service.h"
#include "net/proxy/proxy_script_fetcher_impl.h"
#include "net/proxy/proxy_service.h"
@@ -85,16 +84,10 @@
net::ProxyService* proxy_service;
if (use_v8) {
- net::DhcpProxyScriptFetcherFactory dhcp_factory;
- if (command_line.HasSwitch(switches::kEnableDhcpWpad)) {
- dhcp_factory.set_enabled(true);
- }
-
proxy_service = net::ProxyService::CreateUsingV8ProxyResolver(
proxy_config_service,
num_pac_threads,
new net::ProxyScriptFetcherImpl(context),
- dhcp_factory.Create(context),
context->host_resolver(),
net_log,
context->network_delegate());
« no previous file with comments | « chrome/browser/net/connection_tester.cc ('k') | chrome/chrome_dll.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698