diff options
| author | rdsmith <rdsmith@chromium.org> | 2015-09-16 12:42:03 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-16 19:42:48 +0000 |
| commit | 82957ade8b7a9686c50688ab8caab3a19dcd80b1 (patch) | |
| tree | b0ff38f97b99a189b0c2d2e925787a33dc1a9224 /extensions/shell | |
| parent | a1c3501b272ca1c3f5ddc4f87c4ab397eba5af67 (diff) | |
| download | chromium_src-82957ade8b7a9686c50688ab8caab3a19dcd80b1.zip chromium_src-82957ade8b7a9686c50688ab8caab3a19dcd80b1.tar.gz chromium_src-82957ade8b7a9686c50688ab8caab3a19dcd80b1.tar.bz2 | |
Shift URLRequestContextStorage over to taking scoped_ptrs.
Also includes converting several sources of scoped_ptrs for URLRequestContextStorage, including the ProxyService static generators and the ShellURLRequestContextGetter protected methods to be used by subclasses.
BUG=521705
Review URL: https://codereview.chromium.org/1290243007
Cr-Commit-Position: refs/heads/master@{#349194}
Diffstat (limited to 'extensions/shell')
| -rw-r--r-- | extensions/shell/browser/shell_url_request_context_getter.cc | 6 | ||||
| -rw-r--r-- | extensions/shell/browser/shell_url_request_context_getter.h | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/extensions/shell/browser/shell_url_request_context_getter.cc b/extensions/shell/browser/shell_url_request_context_getter.cc index e151e02..4216a3e 100644 --- a/extensions/shell/browser/shell_url_request_context_getter.cc +++ b/extensions/shell/browser/shell_url_request_context_getter.cc @@ -4,6 +4,7 @@ #include "extensions/shell/browser/shell_url_request_context_getter.h" +#include "base/memory/scoped_ptr.h" #include "content/public/browser/resource_request_info.h" #include "extensions/browser/info_map.h" #include "extensions/shell/browser/shell_network_delegate.h" @@ -34,9 +35,10 @@ ShellURLRequestContextGetter::ShellURLRequestContextGetter( ShellURLRequestContextGetter::~ShellURLRequestContextGetter() { } -net::NetworkDelegate* +scoped_ptr<net::NetworkDelegate> ShellURLRequestContextGetter::CreateNetworkDelegate() { - return new ShellNetworkDelegate(browser_context_, extension_info_map_); + return make_scoped_ptr( + new ShellNetworkDelegate(browser_context_, extension_info_map_)); } } // namespace extensions diff --git a/extensions/shell/browser/shell_url_request_context_getter.h b/extensions/shell/browser/shell_url_request_context_getter.h index 8bda199..0742530 100644 --- a/extensions/shell/browser/shell_url_request_context_getter.h +++ b/extensions/shell/browser/shell_url_request_context_getter.h @@ -40,7 +40,7 @@ class ShellURLRequestContextGetter : InfoMap* extension_info_map); // content::ShellURLRequestContextGetter implementation. - net::NetworkDelegate* CreateNetworkDelegate() override; + scoped_ptr<net::NetworkDelegate> CreateNetworkDelegate() override; protected: ~ShellURLRequestContextGetter() override; |