| 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 "base/memory/ptr_util.h" |
| 11 #include "content/public/browser/browser_thread.h" | 12 #include "content/public/browser/browser_thread.h" |
| 12 #include "content/shell/browser/shell_network_delegate.h" | 13 #include "content/shell/browser/shell_network_delegate.h" |
| 13 #include "net/proxy/proxy_service.h" | 14 #include "net/proxy/proxy_service.h" |
| 14 | 15 |
| 15 namespace content { | 16 namespace content { |
| 16 | 17 |
| 17 LayoutTestURLRequestContextGetter::LayoutTestURLRequestContextGetter( | 18 LayoutTestURLRequestContextGetter::LayoutTestURLRequestContextGetter( |
| 18 bool ignore_certificate_errors, | 19 bool ignore_certificate_errors, |
| 19 const base::FilePath& base_path, | 20 const base::FilePath& base_path, |
| 20 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner, | 21 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner, |
| 21 scoped_refptr<base::SingleThreadTaskRunner> file_task_runner, | 22 scoped_refptr<base::SingleThreadTaskRunner> file_task_runner, |
| 22 ProtocolHandlerMap* protocol_handlers, | 23 ProtocolHandlerMap* protocol_handlers, |
| 23 URLRequestInterceptorScopedVector request_interceptors, | 24 URLRequestInterceptorScopedVector request_interceptors, |
| 24 net::NetLog* net_log) | 25 net::NetLog* net_log) |
| 25 : ShellURLRequestContextGetter(ignore_certificate_errors, | 26 : ShellURLRequestContextGetter(ignore_certificate_errors, |
| 26 base_path, | 27 base_path, |
| 27 std::move(io_task_runner), | 28 std::move(io_task_runner), |
| 28 std::move(file_task_runner), | 29 std::move(file_task_runner), |
| 29 protocol_handlers, | 30 protocol_handlers, |
| 30 std::move(request_interceptors), | 31 std::move(request_interceptors), |
| 31 net_log) { | 32 net_log) { |
| 32 // Must first be created on the UI thread. | 33 // Must first be created on the UI thread. |
| 33 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 34 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
| 34 } | 35 } |
| 35 | 36 |
| 36 LayoutTestURLRequestContextGetter::~LayoutTestURLRequestContextGetter() { | 37 LayoutTestURLRequestContextGetter::~LayoutTestURLRequestContextGetter() { |
| 37 } | 38 } |
| 38 | 39 |
| 39 scoped_ptr<net::NetworkDelegate> | 40 std::unique_ptr<net::NetworkDelegate> |
| 40 LayoutTestURLRequestContextGetter::CreateNetworkDelegate() { | 41 LayoutTestURLRequestContextGetter::CreateNetworkDelegate() { |
| 41 ShellNetworkDelegate::SetAcceptAllCookies(false); | 42 ShellNetworkDelegate::SetAcceptAllCookies(false); |
| 42 return make_scoped_ptr(new ShellNetworkDelegate); | 43 return base::WrapUnique(new ShellNetworkDelegate); |
| 43 } | 44 } |
| 44 | 45 |
| 45 scoped_ptr<net::ProxyConfigService> | 46 std::unique_ptr<net::ProxyConfigService> |
| 46 LayoutTestURLRequestContextGetter::GetProxyConfigService() { | 47 LayoutTestURLRequestContextGetter::GetProxyConfigService() { |
| 47 return nullptr; | 48 return nullptr; |
| 48 } | 49 } |
| 49 | 50 |
| 50 scoped_ptr<net::ProxyService> | 51 std::unique_ptr<net::ProxyService> |
| 51 LayoutTestURLRequestContextGetter::GetProxyService() { | 52 LayoutTestURLRequestContextGetter::GetProxyService() { |
| 52 return net::ProxyService::CreateDirect(); | 53 return net::ProxyService::CreateDirect(); |
| 53 } | 54 } |
| 54 | 55 |
| 55 } // namespace content | 56 } // namespace content |
| OLD | NEW |