Revert 85646 - Adds support for the DHCP portion of the WPAD (proxy auto-discovery) protocol.

chrome/browser/net/proxy_service_factory.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/net/proxy_service_factory.h"
 
 #include "base/command_line.h"
 #include "base/string_number_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/net/pref_proxy_config_service.h"
 #include "chrome/browser/io_thread.h"
 #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"
 #include "net/url_request/url_request_context.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/libcros_service_library.h"
 #include "chrome/browser/chromeos/proxy_config_service.h"
 #endif  // defined(OS_CHROMEOS)
@@ skipping 52 matching lines @@
     int n;
     if (base::StringToInt(s, &n) && n > 0) {
       num_pac_threads = static_cast<size_t>(n);
     } else {
       LOG(ERROR) << "Invalid switch for number of PAC threads: " << s;
     }
   }
 
   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());
   } else {
     proxy_service = net::ProxyService::CreateUsingSystemProxyResolver(
         proxy_config_service,
         num_pac_threads,
         net_log);
   }
 
 #if defined(OS_CHROMEOS)
   if (chromeos::CrosLibrary::Get()->EnsureLoaded()) {
     chromeos::CrosLibrary::Get()->GetLibCrosServiceLibrary()->StartService();
   }
 #endif  // defined(OS_CHROMEOS)
 
   return proxy_service;
 }