| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/strings/string_number_conversions.h" | 8 #include "base/strings/string_number_conversions.h" |
| 9 #include "base/threading/thread.h" | 9 #include "base/threading/thread.h" |
| 10 #include "chrome/browser/browser_process.h" | 10 #include "chrome/browser/browser_process.h" |
| 11 #include "chrome/browser/io_thread.h" | 11 #include "chrome/browser/io_thread.h" |
| 12 #include "chrome/browser/net/pref_proxy_config_tracker_impl.h" | 12 #include "chrome/browser/net/pref_proxy_config_tracker_impl.h" |
| 13 #include "chrome/common/chrome_switches.h" | 13 #include "chrome/common/chrome_switches.h" |
| 14 #include "chrome/common/pref_names.h" | |
| 15 #include "content/public/browser/browser_thread.h" | 14 #include "content/public/browser/browser_thread.h" |
| 16 #include "net/base/net_log.h" | 15 #include "net/base/net_log.h" |
| 17 #include "net/proxy/dhcp_proxy_script_fetcher_factory.h" | 16 #include "net/proxy/dhcp_proxy_script_fetcher_factory.h" |
| 18 #include "net/proxy/proxy_config_service.h" | 17 #include "net/proxy/proxy_config_service.h" |
| 19 #include "net/proxy/proxy_script_fetcher_impl.h" | 18 #include "net/proxy/proxy_script_fetcher_impl.h" |
| 20 #include "net/proxy/proxy_service.h" | 19 #include "net/proxy/proxy_service.h" |
| 21 #include "net/proxy/proxy_service_v8.h" | 20 #include "net/proxy/proxy_service_v8.h" |
| 22 #include "net/url_request/url_request_context.h" | 21 #include "net/url_request/url_request_context.h" |
| 23 | 22 |
| 24 #if defined(OS_CHROMEOS) | 23 #if defined(OS_CHROMEOS) |
| (...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 151 proxy_service = net::ProxyService::CreateUsingSystemProxyResolver( | 150 proxy_service = net::ProxyService::CreateUsingSystemProxyResolver( |
| 152 proxy_config_service, | 151 proxy_config_service, |
| 153 num_pac_threads, | 152 num_pac_threads, |
| 154 net_log); | 153 net_log); |
| 155 } | 154 } |
| 156 | 155 |
| 157 proxy_service->set_quick_check_enabled(quick_check_enabled); | 156 proxy_service->set_quick_check_enabled(quick_check_enabled); |
| 158 | 157 |
| 159 return proxy_service; | 158 return proxy_service; |
| 160 } | 159 } |
| OLD | NEW |