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

components/sync/driver/generic_change_processor_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/driver/generic_change_processor.h"
 
 #include <stddef.h>
 
 #include <utility>
 
+#include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "components/sync/base/model_type.h"
 #include "components/sync/device_info/local_device_info_provider.h"
 #include "components/sync/driver/fake_sync_client.h"
 #include "components/sync/driver/sync_api_component_factory.h"
 #include "components/sync/engine/attachments/fake_attachment_downloader.h"
 #include "components/sync/engine/attachments/fake_attachment_uploader.h"
 #include "components/sync/engine/sync_encryption_handler.h"
@@ skipping 117 matching lines @@
     mock_attachment_service_ = NULL;
     if (test_user_share_) {
       test_user_share_->TearDown();
     }
   }
 
   // Initialize GenericChangeProcessor and related classes for testing with
   // model type |type|.
   void InitializeForType(ModelType type) {
     TearDown();
-    test_user_share_.reset(new TestUserShare);
+    test_user_share_ = base::MakeUnique<TestUserShare>();
     test_user_share_->SetUp();
-    sync_merge_result_.reset(new SyncMergeResult(type));
-    merge_result_ptr_factory_.reset(
-        new base::WeakPtrFactory<SyncMergeResult>(sync_merge_result_.get()));
+    sync_merge_result_ = base::MakeUnique<SyncMergeResult>(type);
+    merge_result_ptr_factory_ =
+        base::MakeUnique<base::WeakPtrFactory<SyncMergeResult>>(
+            sync_merge_result_.get());
 
     ModelTypeSet types = ProtocolTypes();
     for (ModelTypeSet::Iterator iter = types.First(); iter.Good(); iter.Inc()) {
       TestUserShare::CreateRoot(iter.Get(), test_user_share_->user_share());
     }
     test_user_share_->encryption_handler()->Init();
     ConstructGenericChangeProcessor(type);
   }
 
   void ConstructGenericChangeProcessor(ModelType type) {
     std::unique_ptr<AttachmentStore> attachment_store =
         AttachmentStore::CreateInMemoryStore();
-    change_processor_.reset(new GenericChangeProcessor(
+    change_processor_ = base::MakeUnique<GenericChangeProcessor>(
         type, base::MakeUnique<DataTypeErrorHandlerMock>(),
         syncable_service_ptr_factory_.GetWeakPtr(),
         merge_result_ptr_factory_->GetWeakPtr(), test_user_share_->user_share(),
-        &sync_client_, attachment_store->CreateAttachmentStoreForSync()));
+        &sync_client_, attachment_store->CreateAttachmentStoreForSync());
     mock_attachment_service_ = sync_factory_.GetMockAttachmentService();
   }
 
   void BuildChildNodes(ModelType type, int n) {
     WriteTransaction trans(FROM_HERE, user_share());
     for (int i = 0; i < n; ++i) {
       WriteNode node(&trans);
       node.InitUniqueByCreation(type, base::StringPrintf("node%05d", i));
     }
   }
@@ skipping 320 matching lines @@
   SyncDataList sync_data = change_processor()->GetAllSyncData(SESSIONS);
   ASSERT_EQ(sync_data.size(), 1U);
   ASSERT_EQ("session tag 2",
             sync_data[0].GetSpecifics().session().session_tag());
   EXPECT_FALSE(SyncDataRemote(sync_data[0]).GetClientTagHash().empty());
 }
 
 }  // namespace
 
 }  // namespace syncer