Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1247)

Unified Diff: content/browser/resolve_proxy_msg_helper_unittest.cc

Issue 1874893002: Convert //content/browser from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 {
« no previous file with comments | « content/browser/quota/quota_temporary_storage_evictor_unittest.cc ('k') | content/browser/resource_context_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698