Index: content/browser/resolve_proxy_msg_helper_unittest.cc |
diff --git a/content/browser/resolve_proxy_msg_helper_unittest.cc b/content/browser/resolve_proxy_msg_helper_unittest.cc |
index bc723fe87961d61906f8646b8c4a81eed1e779dc..43656c2a4e66dc0d5a7a938c4658177af34fc166 100644 |
--- a/content/browser/resolve_proxy_msg_helper_unittest.cc |
+++ b/content/browser/resolve_proxy_msg_helper_unittest.cc |
@@ -4,6 +4,7 @@ |
#include "content/browser/resolve_proxy_msg_helper.h" |
+#include "base/memory/ptr_util.h" |
#include "content/browser/browser_thread_impl.h" |
#include "content/common/view_messages.h" |
#include "ipc/ipc_test_sink.h" |
@@ -60,8 +61,8 @@ class ResolveProxyMsgHelperTest : public testing::Test, public IPC::Listener { |
ResolveProxyMsgHelperTest() |
: resolver_factory_(new net::MockAsyncProxyResolverFactory(false)), |
service_( |
- new net::ProxyService(make_scoped_ptr(new MockProxyConfigService), |
- make_scoped_ptr(resolver_factory_), |
+ new net::ProxyService(base::WrapUnique(new MockProxyConfigService), |
+ base::WrapUnique(resolver_factory_), |
NULL)), |
helper_(new TestResolveProxyMsgHelper(service_.get(), this)), |
io_thread_(BrowserThread::IO, &message_loop_) { |
@@ -84,9 +85,9 @@ class ResolveProxyMsgHelperTest : public testing::Test, public IPC::Listener { |
net::MockAsyncProxyResolverFactory* resolver_factory_; |
net::MockAsyncProxyResolver resolver_; |
- scoped_ptr<net::ProxyService> service_; |
+ std::unique_ptr<net::ProxyService> service_; |
scoped_refptr<ResolveProxyMsgHelper> helper_; |
- scoped_ptr<PendingResult> pending_result_; |
+ std::unique_ptr<PendingResult> pending_result_; |
private: |
bool OnMessageReceived(const IPC::Message& msg) override { |