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 "base/memory/scoped_ptr.h" |
7 #include "content/public/browser/resource_request_info.h" | 8 #include "content/public/browser/resource_request_info.h" |
8 #include "extensions/browser/info_map.h" | 9 #include "extensions/browser/info_map.h" |
9 #include "extensions/shell/browser/shell_network_delegate.h" | 10 #include "extensions/shell/browser/shell_network_delegate.h" |
10 | 11 |
11 namespace extensions { | 12 namespace extensions { |
12 | 13 |
13 ShellURLRequestContextGetter::ShellURLRequestContextGetter( | 14 ShellURLRequestContextGetter::ShellURLRequestContextGetter( |
14 content::BrowserContext* browser_context, | 15 content::BrowserContext* browser_context, |
15 bool ignore_certificate_errors, | 16 bool ignore_certificate_errors, |
16 const base::FilePath& base_path, | 17 const base::FilePath& base_path, |
(...skipping 10 matching lines...) Expand all Loading... |
27 protocol_handlers, | 28 protocol_handlers, |
28 request_interceptors.Pass(), | 29 request_interceptors.Pass(), |
29 net_log), | 30 net_log), |
30 browser_context_(browser_context), | 31 browser_context_(browser_context), |
31 extension_info_map_(extension_info_map) { | 32 extension_info_map_(extension_info_map) { |
32 } | 33 } |
33 | 34 |
34 ShellURLRequestContextGetter::~ShellURLRequestContextGetter() { | 35 ShellURLRequestContextGetter::~ShellURLRequestContextGetter() { |
35 } | 36 } |
36 | 37 |
37 net::NetworkDelegate* | 38 scoped_ptr<net::NetworkDelegate> |
38 ShellURLRequestContextGetter::CreateNetworkDelegate() { | 39 ShellURLRequestContextGetter::CreateNetworkDelegate() { |
39 return new ShellNetworkDelegate(browser_context_, extension_info_map_); | 40 return make_scoped_ptr( |
| 41 new ShellNetworkDelegate(browser_context_, extension_info_map_)); |
40 } | 42 } |
41 | 43 |
42 } // namespace extensions | 44 } // namespace extensions |
OLD | NEW |