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 /device | |
| 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 'device')
| -rw-r--r-- | device/test/usb_test_gadget_impl.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/device/test/usb_test_gadget_impl.cc b/device/test/usb_test_gadget_impl.cc index 0d88d57..df85756 100644 --- a/device/test/usb_test_gadget_impl.cc +++ b/device/test/usb_test_gadget_impl.cc @@ -145,8 +145,7 @@ class URLRequestContextGetter : public net::URLRequestContextGetter { net::URLRequestContext* GetURLRequestContext() override { if (!context_) { net::URLRequestContextBuilder context_builder; - context_builder.set_proxy_service( - make_scoped_ptr(net::ProxyService::CreateDirect())); + context_builder.set_proxy_service(net::ProxyService::CreateDirect()); context_ = context_builder.Build().Pass(); } return context_.get(); |