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

components/sync/syncable/test_user_share.cc

 // Copyright 2012 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/syncable/test_user_share.h"
 
 #include "base/compiler_specific.h"
+#include "base/memory/ptr_util.h"
 #include "components/sync/syncable/directory.h"
 #include "components/sync/syncable/mutable_entry.h"
 #include "components/sync/syncable/syncable_read_transaction.h"
 #include "components/sync/syncable/syncable_write_transaction.h"
 #include "components/sync/test/engine/test_directory_setter_upper.h"
 #include "components/sync/test/engine/test_id_factory.h"
 #include "components/sync/test/engine/test_syncable_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace syncer {
 
 TestUserShare::TestUserShare() : dir_maker_(new TestDirectorySetterUpper()) {}
 
 TestUserShare::~TestUserShare() {
   if (user_share_)
     ADD_FAILURE() << "Should have called TestUserShare::TearDown()";
 }
 
 void TestUserShare::SetUp() {
-  user_share_.reset(new UserShare());
+  user_share_ = base::MakeUnique<UserShare>();
   dir_maker_->SetUp();
 
   // The pointer is owned by dir_maker_, we should not be storing it in a
   // unique_ptr.  We must be careful to ensure the unique_ptr never deletes it.
   user_share_->directory.reset(dir_maker_->directory());
 }
 
 void TestUserShare::TearDown() {
   // Ensure the unique_ptr doesn't delete the memory we don't own.
   ignore_result(user_share_->directory.release());
 
   user_share_.reset();
   dir_maker_->TearDown();
 }
 
 bool TestUserShare::Reload() {
   if (!user_share_->directory->SaveChanges())
     return false;
 
   syncable::DirectoryBackingStore* saved_store =
       user_share_->directory->store_.release();
 
   // Ensure the unique_ptr doesn't delete the memory we don't own.
   ignore_result(user_share_->directory.release());
-  user_share_.reset(new UserShare());
+  user_share_ = base::MakeUnique<UserShare>();
   dir_maker_->SetUpWith(saved_store);
   user_share_->directory.reset(dir_maker_->directory());
   return true;
 }
 
 UserShare* TestUserShare::user_share() {
   return user_share_.get();
 }
 
 SyncEncryptionHandler* TestUserShare::encryption_handler() {
@@ skipping 11 matching lines @@
   CreateTypeRoot(&wtrans, directory, model_type);
   return true;
 }
 
 size_t TestUserShare::GetDeleteJournalSize() const {
   syncable::ReadTransaction trans(FROM_HERE, user_share_->directory.get());
   return user_share_->directory->delete_journal()->GetDeleteJournalSize(&trans);
 }
 
 }  // namespace syncer