Re-write many calls to WrapUnique() with MakeUnique()

chrome/browser/password_manager/password_store_x_unittest.cc

 // Copyright (c) 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 "chrome/browser/password_manager/password_store_x.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <utility>
@@ skipping 313 matching lines @@
   base::ScopedTempDir temp_dir_;
   BackendType backend_type_;
   scoped_refptr<PasswordStoreX> store_;
 
   DISALLOW_COPY_AND_ASSIGN(PasswordStoreXTestDelegate);
 };
 
 PasswordStoreXTestDelegate::PasswordStoreXTestDelegate(BackendType backend_type)
     : backend_type_(backend_type) {
   SetupTempDir();
-  store_ = new PasswordStoreX(
-      base::ThreadTaskRunnerHandle::Get(), base::ThreadTaskRunnerHandle::Get(),
-      base::WrapUnique(
-          new password_manager::LoginDatabase(test_login_db_file_path())),
-      GetBackend(backend_type_));
+  store_ = new PasswordStoreX(base::ThreadTaskRunnerHandle::Get(),
+                              base::ThreadTaskRunnerHandle::Get(),
+                              base::MakeUnique<password_manager::LoginDatabase>(
+                                  test_login_db_file_path()),
+                              GetBackend(backend_type_));
   store_->Init(syncer::SyncableService::StartSyncFlare());
 }
 
 PasswordStoreXTestDelegate::~PasswordStoreXTestDelegate() {
   store_->ShutdownOnUIThread();
   FinishAsyncProcessing();
 }
 
 void PasswordStoreXTestDelegate::FinishAsyncProcessing() {
   base::RunLoop().RunUntilIdle();
@@ skipping 234 matching lines @@
 
 INSTANTIATE_TEST_CASE_P(NoBackend,
                         PasswordStoreXTest,
                         testing::Values(NO_BACKEND));
 INSTANTIATE_TEST_CASE_P(FailingBackend,
                         PasswordStoreXTest,
                         testing::Values(FAILING_BACKEND));
 INSTANTIATE_TEST_CASE_P(WorkingBackend,
                         PasswordStoreXTest,
                         testing::Values(WORKING_BACKEND));