OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/net/proxy_service_factory.h" | 5 #include "chrome/browser/net/proxy_service_factory.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/string_number_conversions.h" | 8 #include "base/string_number_conversions.h" |
9 #include "chrome/browser/browser_process.h" | 9 #include "chrome/browser/browser_process.h" |
10 #include "chrome/browser/net/pref_proxy_config_service.h" | 10 #include "chrome/browser/net/pref_proxy_config_service.h" |
11 #include "chrome/browser/io_thread.h" | 11 #include "chrome/browser/io_thread.h" |
12 #include "chrome/common/chrome_switches.h" | 12 #include "chrome/common/chrome_switches.h" |
13 #include "content/browser/browser_thread.h" | 13 #include "content/browser/browser_thread.h" |
14 #include "net/base/net_log.h" | 14 #include "net/base/net_log.h" |
| 15 #include "net/proxy/dhcp_proxy_script_fetcher_factory.h" |
15 #include "net/proxy/proxy_config_service.h" | 16 #include "net/proxy/proxy_config_service.h" |
16 #include "net/proxy/proxy_script_fetcher_impl.h" | 17 #include "net/proxy/proxy_script_fetcher_impl.h" |
17 #include "net/proxy/proxy_service.h" | 18 #include "net/proxy/proxy_service.h" |
18 #include "net/url_request/url_request_context.h" | 19 #include "net/url_request/url_request_context.h" |
19 | 20 |
20 #if defined(OS_CHROMEOS) | 21 #if defined(OS_CHROMEOS) |
21 #include "chrome/browser/chromeos/cros/cros_library.h" | 22 #include "chrome/browser/chromeos/cros/cros_library.h" |
22 #include "chrome/browser/chromeos/cros/libcros_service_library.h" | 23 #include "chrome/browser/chromeos/cros/libcros_service_library.h" |
23 #include "chrome/browser/chromeos/proxy_config_service.h" | 24 #include "chrome/browser/chromeos/proxy_config_service.h" |
24 #endif // defined(OS_CHROMEOS) | 25 #endif // defined(OS_CHROMEOS) |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
77 int n; | 78 int n; |
78 if (base::StringToInt(s, &n) && n > 0) { | 79 if (base::StringToInt(s, &n) && n > 0) { |
79 num_pac_threads = static_cast<size_t>(n); | 80 num_pac_threads = static_cast<size_t>(n); |
80 } else { | 81 } else { |
81 LOG(ERROR) << "Invalid switch for number of PAC threads: " << s; | 82 LOG(ERROR) << "Invalid switch for number of PAC threads: " << s; |
82 } | 83 } |
83 } | 84 } |
84 | 85 |
85 net::ProxyService* proxy_service; | 86 net::ProxyService* proxy_service; |
86 if (use_v8) { | 87 if (use_v8) { |
| 88 net::DhcpProxyScriptFetcherFactory dhcp_factory; |
| 89 if (command_line.HasSwitch(switches::kEnableDhcpWpad)) { |
| 90 dhcp_factory.set_enabled(true); |
| 91 } |
| 92 |
87 proxy_service = net::ProxyService::CreateUsingV8ProxyResolver( | 93 proxy_service = net::ProxyService::CreateUsingV8ProxyResolver( |
88 proxy_config_service, | 94 proxy_config_service, |
89 num_pac_threads, | 95 num_pac_threads, |
90 new net::ProxyScriptFetcherImpl(context), | 96 new net::ProxyScriptFetcherImpl(context), |
| 97 dhcp_factory.Create(context), |
91 context->host_resolver(), | 98 context->host_resolver(), |
92 net_log, | 99 net_log, |
93 context->network_delegate()); | 100 context->network_delegate()); |
94 } else { | 101 } else { |
95 proxy_service = net::ProxyService::CreateUsingSystemProxyResolver( | 102 proxy_service = net::ProxyService::CreateUsingSystemProxyResolver( |
96 proxy_config_service, | 103 proxy_config_service, |
97 num_pac_threads, | 104 num_pac_threads, |
98 net_log); | 105 net_log); |
99 } | 106 } |
100 | 107 |
101 #if defined(OS_CHROMEOS) | 108 #if defined(OS_CHROMEOS) |
102 if (chromeos::CrosLibrary::Get()->EnsureLoaded()) { | 109 if (chromeos::CrosLibrary::Get()->EnsureLoaded()) { |
103 chromeos::CrosLibrary::Get()->GetLibCrosServiceLibrary()->StartService(); | 110 chromeos::CrosLibrary::Get()->GetLibCrosServiceLibrary()->StartService(); |
104 } | 111 } |
105 #endif // defined(OS_CHROMEOS) | 112 #endif // defined(OS_CHROMEOS) |
106 | 113 |
107 return proxy_service; | 114 return proxy_service; |
108 } | 115 } |
OLD | NEW |