OLD | NEW |
---|---|
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "extensions/shell/browser/shell_url_request_context_getter.h" | 5 #include "extensions/shell/browser/shell_url_request_context_getter.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "content/public/browser/resource_request_info.h" | 10 #include "content/public/browser/resource_request_info.h" |
11 #include "extensions/browser/info_map.h" | 11 #include "extensions/browser/info_map.h" |
12 #include "extensions/shell/browser/shell_network_delegate.h" | 12 #include "extensions/shell/browser/shell_network_delegate.h" |
13 | 13 |
14 namespace extensions { | 14 namespace extensions { |
15 | 15 |
16 ShellURLRequestContextGetter::ShellURLRequestContextGetter( | 16 ShellURLRequestContextGetter::ShellURLRequestContextGetter( |
17 content::BrowserContext* browser_context, | 17 content::BrowserContext* browser_context, |
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 content::ProtocolHandlerMap* protocol_handlers, | 22 content::ProtocolHandlerMap* protocol_handlers, |
23 content::URLRequestInterceptorScopedVector request_interceptors, | 23 content::URLRequestInterceptorScopedVector request_interceptors, |
24 net::NetLog* net_log, | 24 net::NetLog* net_log, |
25 InfoMap* extension_info_map) | 25 InfoMap* extension_info_map) |
26 : content::ShellURLRequestContextGetter(ignore_certificate_errors, | 26 : content::ShellURLRequestContextGetter(ignore_certificate_errors, |
27 base_path, | 27 base_path, |
28 io_loop, | 28 io_task_runner, |
29 file_loop, | 29 file_task_runner, |
Ryan Sleevi
2016/02/25 20:50:14
Have you heard the gospel of std::move() ? Line 31
| |
30 protocol_handlers, | 30 protocol_handlers, |
31 std::move(request_interceptors), | 31 std::move(request_interceptors), |
32 net_log), | 32 net_log), |
33 browser_context_(browser_context), | 33 browser_context_(browser_context), |
34 extension_info_map_(extension_info_map) {} | 34 extension_info_map_(extension_info_map) {} |
35 | 35 |
36 ShellURLRequestContextGetter::~ShellURLRequestContextGetter() { | 36 ShellURLRequestContextGetter::~ShellURLRequestContextGetter() { |
37 } | 37 } |
38 | 38 |
39 scoped_ptr<net::NetworkDelegate> | 39 scoped_ptr<net::NetworkDelegate> |
40 ShellURLRequestContextGetter::CreateNetworkDelegate() { | 40 ShellURLRequestContextGetter::CreateNetworkDelegate() { |
41 return make_scoped_ptr( | 41 return make_scoped_ptr( |
42 new ShellNetworkDelegate(browser_context_, extension_info_map_)); | 42 new ShellNetworkDelegate(browser_context_, extension_info_map_)); |
43 } | 43 } |
44 | 44 |
45 } // namespace extensions | 45 } // namespace extensions |
OLD | NEW |