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

components/sync/test/engine/test_directory_setter_upper.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/test/engine/test_directory_setter_upper.h"
 
 #include "base/files/file_util.h"
 #include "base/location.h"
+#include "base/memory/ptr_util.h"
 #include "base/strings/string_util.h"
 #include "components/sync/syncable/directory.h"
 #include "components/sync/syncable/in_memory_directory_backing_store.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/test_transaction_observer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace syncer {
 
 TestDirectorySetterUpper::TestDirectorySetterUpper() : name_("Test") {}
 
 TestDirectorySetterUpper::~TestDirectorySetterUpper() {}
 
 void TestDirectorySetterUpper::SetUp() {
-  test_transaction_observer_.reset(new syncable::TestTransactionObserver());
+  test_transaction_observer_ =
+      base::MakeUnique<syncable::TestTransactionObserver>();
   WeakHandle<syncable::TransactionObserver> transaction_observer =
       MakeWeakHandle(test_transaction_observer_->AsWeakPtr());
 
-  directory_.reset(new syncable::Directory(
+  directory_ = base::MakeUnique<syncable::Directory>(
       new syncable::InMemoryDirectoryBackingStore(name_),
       MakeWeakHandle(handler_.GetWeakPtr()), base::Closure(),
-      &encryption_handler_, encryption_handler_.cryptographer()));
+      &encryption_handler_, encryption_handler_.cryptographer());
   ASSERT_EQ(syncable::OPENED,
             directory_->Open(name_, &delegate_, transaction_observer));
 }
 
 void TestDirectorySetterUpper::SetUpWith(
     syncable::DirectoryBackingStore* directory_store) {
   CHECK(directory_store);
-  test_transaction_observer_.reset(new syncable::TestTransactionObserver());
+  test_transaction_observer_ =
+      base::MakeUnique<syncable::TestTransactionObserver>();
   WeakHandle<syncable::TransactionObserver> transaction_observer =
       MakeWeakHandle(test_transaction_observer_->AsWeakPtr());
 
-  directory_.reset(new syncable::Directory(
+  directory_ = base::MakeUnique<syncable::Directory>(
       directory_store, MakeWeakHandle(handler_.GetWeakPtr()), base::Closure(),
-      &encryption_handler_, encryption_handler_.cryptographer()));
+      &encryption_handler_, encryption_handler_.cryptographer());
   ASSERT_EQ(syncable::OPENED,
             directory_->Open(name_, &delegate_, transaction_observer));
 }
 
 void TestDirectorySetterUpper::TearDown() {
   if (!directory()->good())
     return;
 
   RunInvariantCheck();
   directory()->SaveChanges();
   RunInvariantCheck();
   directory()->SaveChanges();
 
   directory_.reset();
 }
 
 void TestDirectorySetterUpper::RunInvariantCheck() {
   // Check invariants for all items.
   syncable::ReadTransaction trans(FROM_HERE, directory());
 
   // The TestUnrecoverableErrorHandler that this directory was constructed with
   // will handle error reporting, so we can safely ignore the return value.
   directory()->FullyCheckTreeInvariants(&trans);
 }
 
 }  // namespace syncer