[Sync] Rewriting ".reset(new" pattern to use "= base::MakeUnique" instead.

components/sync/engine_impl/attachments/attachment_uploader_impl_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/sync/engine_impl/attachments/attachment_uploader_impl.h"
 
 #include <utility>
 #include <vector>
 
 #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"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/synchronization/lock.h"
 #include "base/test/histogram_tester.h"
 #include "base/threading/thread.h"
@@ skipping 241 matching lines @@
 AttachmentUploaderImplTest::AttachmentUploaderImplTest()
     : weak_ptr_factory_(this) {}
 
 void AttachmentUploaderImplTest::OnRequestReceived(const HttpRequest& request) {
   DCHECK(CalledOnValidThread());
   http_requests_received_.push_back(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());
 
   ASSERT_TRUE(server_.Start());
   server_.RegisterRequestHandler(
       base::Bind(&RequestHandler::HandleRequest,
                  base::Unretained(request_handler_.get())));
 
   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));
 }
 
 void AttachmentUploaderImplTest::TearDown() {
   base::RunLoop().RunUntilIdle();
 }
 
 void AttachmentUploaderImplTest::RunAndWaitFor(int num_uploads) {
@@ skipping 358 matching lines @@
   scoped_refptr<base::RefCountedString> hello_world(new base::RefCountedString);
   hello_world->data() = "hello world";
   EXPECT_EQ("yZRlqg==", AttachmentUploaderImpl::FormatCrc32cHash(
                             ComputeCrc32c(hello_world)));
 }
 
 // TODO(maniscalco): Add test case for when we are uploading an attachment that
 // already exists.  409 Conflict? (bug 379825)
 
 }  // namespace syncer