OLD | NEW |
---|---|
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "content/shell/browser/layout_test/layout_test_url_request_context_gett er.h" | 5 #include "content/shell/browser/layout_test/layout_test_url_request_context_gett er.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
11 #include "content/public/browser/browser_thread.h" | 11 #include "content/public/browser/browser_thread.h" |
12 #include "content/shell/browser/shell_network_delegate.h" | 12 #include "content/shell/browser/shell_network_delegate.h" |
13 #include "net/proxy/proxy_service.h" | 13 #include "net/proxy/proxy_service.h" |
14 | 14 |
15 namespace content { | 15 namespace content { |
16 | 16 |
17 LayoutTestURLRequestContextGetter::LayoutTestURLRequestContextGetter( | 17 LayoutTestURLRequestContextGetter::LayoutTestURLRequestContextGetter( |
18 bool ignore_certificate_errors, | 18 bool ignore_certificate_errors, |
19 const base::FilePath& base_path, | 19 const base::FilePath& base_path, |
20 base::MessageLoop* io_loop, | 20 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner, |
21 base::MessageLoop* file_loop, | 21 scoped_refptr<base::SingleThreadTaskRunner> file_task_runner, |
22 ProtocolHandlerMap* protocol_handlers, | 22 ProtocolHandlerMap* protocol_handlers, |
23 URLRequestInterceptorScopedVector request_interceptors, | 23 URLRequestInterceptorScopedVector request_interceptors, |
24 net::NetLog* net_log) | 24 net::NetLog* net_log) |
25 : ShellURLRequestContextGetter(ignore_certificate_errors, | 25 : ShellURLRequestContextGetter(ignore_certificate_errors, |
26 base_path, | 26 base_path, |
27 io_loop, | 27 io_task_runner, |
28 file_loop, | 28 file_task_runner, |
Ryan Sleevi
2016/02/25 20:50:14
drive by: you could std::move() these (like line 3
| |
29 protocol_handlers, | 29 protocol_handlers, |
30 std::move(request_interceptors), | 30 std::move(request_interceptors), |
31 net_log) { | 31 net_log) { |
32 // Must first be created on the UI thread. | 32 // Must first be created on the UI thread. |
33 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 33 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
34 } | 34 } |
35 | 35 |
36 LayoutTestURLRequestContextGetter::~LayoutTestURLRequestContextGetter() { | 36 LayoutTestURLRequestContextGetter::~LayoutTestURLRequestContextGetter() { |
37 } | 37 } |
38 | 38 |
39 scoped_ptr<net::NetworkDelegate> | 39 scoped_ptr<net::NetworkDelegate> |
40 LayoutTestURLRequestContextGetter::CreateNetworkDelegate() { | 40 LayoutTestURLRequestContextGetter::CreateNetworkDelegate() { |
41 ShellNetworkDelegate::SetAcceptAllCookies(false); | 41 ShellNetworkDelegate::SetAcceptAllCookies(false); |
42 return make_scoped_ptr(new ShellNetworkDelegate); | 42 return make_scoped_ptr(new ShellNetworkDelegate); |
43 } | 43 } |
44 | 44 |
45 scoped_ptr<net::ProxyConfigService> | 45 scoped_ptr<net::ProxyConfigService> |
46 LayoutTestURLRequestContextGetter::GetProxyConfigService() { | 46 LayoutTestURLRequestContextGetter::GetProxyConfigService() { |
47 return nullptr; | 47 return nullptr; |
48 } | 48 } |
49 | 49 |
50 scoped_ptr<net::ProxyService> | 50 scoped_ptr<net::ProxyService> |
51 LayoutTestURLRequestContextGetter::GetProxyService() { | 51 LayoutTestURLRequestContextGetter::GetProxyService() { |
52 return net::ProxyService::CreateDirect(); | 52 return net::ProxyService::CreateDirect(); |
53 } | 53 } |
54 | 54 |
55 } // namespace content | 55 } // namespace content |
OLD | NEW |