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

components/sync/syncable/syncable_unittest.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 <stdint.h>
 
 #include <memory>
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/location.h"
 #include "base/logging.h"
+#include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
 #include "base/synchronization/condition_variable.h"
 #include "base/test/values_test_util.h"
 #include "base/threading/platform_thread.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "components/sync/base/fake_encryptor.h"
 #include "components/sync/base/test_unrecoverable_error_handler.h"
 #include "components/sync/protocol/bookmark_specifics.pb.h"
@@ skipping 309 matching lines @@
     specifics.mutable_bookmark()->set_favicon("PNG");
     specifics.mutable_bookmark()->set_url("http://nowhere");
     create.PutSpecifics(specifics);
     update.PutServerSpecifics(specifics);
     create_pre_save = create.GetKernelCopy();
     update_pre_save = update.GetKernelCopy();
     create_id = create.GetId();
   }
 
   dir()->SaveChanges();
-  dir().reset(
-      new Directory(new OnDiskDirectoryBackingStore(kDirectoryName, file_path_),
-                    MakeWeakHandle(unrecoverable_error_handler()->GetWeakPtr()),
-                    base::Closure(), NULL, NULL));
+  dir() = base::MakeUnique<Directory>(
+      new OnDiskDirectoryBackingStore(kDirectoryName, file_path_),
+      MakeWeakHandle(unrecoverable_error_handler()->GetWeakPtr()),
+      base::Closure(), nullptr, nullptr);
 
   ASSERT_TRUE(dir().get());
   ASSERT_EQ(OPENED, dir()->Open(kDirectoryName, directory_change_delegate(),
                                 NullTransactionObserver()));
   ASSERT_TRUE(dir()->good());
 
   {
     ReadTransaction trans(FROM_HERE, dir().get());
     Entry create(&trans, GET_BY_ID, create_id);
     EXPECT_EQ(1, CountEntriesWithName(&trans, trans.root_id(), create_name));
@@ skipping 296 matching lines @@
 TEST_F(SyncableClientTagTest, TestClientTagIndexDuplicateServer) {
   EXPECT_TRUE(CreateWithDefaultTag(factory_.NewServerId(), true));
   EXPECT_FALSE(CreateWithDefaultTag(factory_.NewServerId(), true));
   EXPECT_FALSE(CreateWithDefaultTag(factory_.NewServerId(), false));
   EXPECT_FALSE(CreateWithDefaultTag(factory_.NewLocalId(), false));
   EXPECT_FALSE(CreateWithDefaultTag(factory_.NewLocalId(), true));
 }
 
 }  // namespace syncable
 }  // namespace syncer