| 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 "base/threading/thread.h" |
| 9 #include "chrome/browser/browser_process.h" | 10 #include "chrome/browser/browser_process.h" |
| 10 #include "chrome/browser/io_thread.h" | 11 #include "chrome/browser/io_thread.h" |
| 11 #include "chrome/browser/net/pref_proxy_config_tracker.h" | 12 #include "chrome/browser/net/pref_proxy_config_tracker.h" |
| 12 #include "chrome/common/chrome_switches.h" | 13 #include "chrome/common/chrome_switches.h" |
| 13 #include "content/public/browser/browser_thread.h" | 14 #include "content/public/browser/browser_thread.h" |
| 14 #include "net/base/net_log.h" | 15 #include "net/base/net_log.h" |
| 15 #include "net/proxy/dhcp_proxy_script_fetcher_factory.h" | 16 #include "net/proxy/dhcp_proxy_script_fetcher_factory.h" |
| 16 #include "net/proxy/proxy_config_service.h" | 17 #include "net/proxy/proxy_config_service.h" |
| 17 #include "net/proxy/proxy_script_fetcher_impl.h" | 18 #include "net/proxy/proxy_script_fetcher_impl.h" |
| 18 #include "net/proxy/proxy_service.h" | 19 #include "net/proxy/proxy_service.h" |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 116 context->network_delegate()); | 117 context->network_delegate()); |
| 117 } else { | 118 } else { |
| 118 proxy_service = net::ProxyService::CreateUsingSystemProxyResolver( | 119 proxy_service = net::ProxyService::CreateUsingSystemProxyResolver( |
| 119 proxy_config_service, | 120 proxy_config_service, |
| 120 num_pac_threads, | 121 num_pac_threads, |
| 121 net_log); | 122 net_log); |
| 122 } | 123 } |
| 123 | 124 |
| 124 return proxy_service; | 125 return proxy_service; |
| 125 } | 126 } |
| OLD | NEW |