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

Unified Diff: components/sync/engine_impl/attachments/attachment_uploader_impl_unittest.cc

Issue 2422253002: [Sync] Rewriting ".reset(new" pattern to use "= base::MakeUnique" instead. (Closed)
Patch Set: Fixing compile. Created 4 years, 2 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: components/sync/engine_impl/attachments/attachment_uploader_impl_unittest.cc
diff --git a/components/sync/engine_impl/attachments/attachment_uploader_impl_unittest.cc b/components/sync/engine_impl/attachments/attachment_uploader_impl_unittest.cc
index 5284b5f101051e40c2237e0f59be595d3d1e6f43..a2dcfd855c49bef78486ef606eb9fac6ca770d33 100644
--- a/components/sync/engine_impl/attachments/attachment_uploader_impl_unittest.cc
+++ b/components/sync/engine_impl/attachments/attachment_uploader_impl_unittest.cc
@@ -10,6 +10,7 @@
#include "base/bind.h"
#include "base/callback.h"
#include "base/location.h"
+#include "base/memory/ptr_util.h"
#include "base/memory/ref_counted.h"
#include "base/memory/ref_counted_memory.h"
#include "base/message_loop/message_loop.h"
@@ -271,8 +272,8 @@ void AttachmentUploaderImplTest::OnRequestReceived(const HttpRequest& request) {
void AttachmentUploaderImplTest::SetUp() {
DCHECK(CalledOnValidThread());
- request_handler_.reset(new RequestHandler(message_loop_.task_runner(),
- weak_ptr_factory_.GetWeakPtr()));
+ request_handler_ = base::MakeUnique<RequestHandler>(
+ message_loop_.task_runner(), weak_ptr_factory_.GetWeakPtr());
url_request_context_getter_ =
new net::TestURLRequestContextGetter(message_loop_.task_runner());
@@ -283,15 +284,15 @@ void AttachmentUploaderImplTest::SetUp() {
GURL url(base::StringPrintf("http://localhost:%u/", server_.port()));
- token_service_.reset(new MockOAuth2TokenService);
+ token_service_ = base::MakeUnique<MockOAuth2TokenService>();
scoped_refptr<OAuth2TokenServiceRequest::TokenServiceProvider>
token_service_provider(new TokenServiceProvider(token_service_.get()));
OAuth2TokenService::ScopeSet scopes;
scopes.insert(GaiaConstants::kChromeSyncOAuth2Scope);
- uploader().reset(new AttachmentUploaderImpl(
+ uploader() = base::MakeUnique<AttachmentUploaderImpl>(
url, url_request_context_getter_, kAccountId, scopes,
- token_service_provider, std::string(kStoreBirthday), kModelType));
+ token_service_provider, std::string(kStoreBirthday), kModelType);
upload_callback_ = base::Bind(&AttachmentUploaderImplTest::UploadDone,
base::Unretained(this));

Powered by Google App Engine
This is Rietveld 408576698