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 "net/proxy/proxy_service_v8.h" | 5 #include "net/proxy/proxy_service_v8.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
11 #include "base/memory/ptr_util.h" | 11 #include "base/memory/ptr_util.h" |
12 #include "base/thread_task_runner_handle.h" | |
13 #include "base/threading/thread_checker.h" | 12 #include "base/threading/thread_checker.h" |
| 13 #include "base/threading/thread_task_runner_handle.h" |
14 #include "net/proxy/network_delegate_error_observer.h" | 14 #include "net/proxy/network_delegate_error_observer.h" |
15 #include "net/proxy/proxy_resolver.h" | 15 #include "net/proxy/proxy_resolver.h" |
16 #include "net/proxy/proxy_resolver_factory.h" | 16 #include "net/proxy/proxy_resolver_factory.h" |
17 #include "net/proxy/proxy_resolver_v8_tracing_wrapper.h" | 17 #include "net/proxy/proxy_resolver_v8_tracing_wrapper.h" |
18 #include "net/proxy/proxy_service.h" | 18 #include "net/proxy/proxy_service.h" |
19 | 19 |
20 namespace net { | 20 namespace net { |
21 | 21 |
22 // static | 22 // static |
23 std::unique_ptr<ProxyService> CreateProxyServiceUsingV8ProxyResolver( | 23 std::unique_ptr<ProxyService> CreateProxyServiceUsingV8ProxyResolver( |
(...skipping 17 matching lines...) Expand all Loading... |
41 net_log)); | 41 net_log)); |
42 | 42 |
43 // Configure fetchers to use for PAC script downloads and auto-detect. | 43 // Configure fetchers to use for PAC script downloads and auto-detect. |
44 proxy_service->SetProxyScriptFetchers(proxy_script_fetcher, | 44 proxy_service->SetProxyScriptFetchers(proxy_script_fetcher, |
45 std::move(dhcp_proxy_script_fetcher)); | 45 std::move(dhcp_proxy_script_fetcher)); |
46 | 46 |
47 return proxy_service; | 47 return proxy_service; |
48 } | 48 } |
49 | 49 |
50 } // namespace net | 50 } // namespace net |
OLD | NEW |