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

chrome/browser/ui/passwords/password_dialog_controller_impl_unittest.cc

 // Copyright 2016 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/ui/passwords/password_dialog_controller_impl.h"
 
 #include <memory>
 #include <utility>
 #include <vector>
 
@@ skipping 70 matching lines @@
 };
 
 TEST_F(PasswordDialogControllerTest, ShowAccountChooser) {
   base::HistogramTester histogram_tester;
   StrictMock<MockPasswordPrompt> prompt;
   autofill::PasswordForm local_form = GetLocalForm();
   autofill::PasswordForm local_form2 = local_form;
   local_form2.username_value = base::ASCIIToUTF16(kUsername2);
   autofill::PasswordForm idp_form = GetFederationProviderForm();
   std::vector<std::unique_ptr<autofill::PasswordForm>> locals;
-  locals.push_back(base::WrapUnique(new autofill::PasswordForm(local_form)));
-  locals.push_back(base::WrapUnique(new autofill::PasswordForm(local_form2)));
+  locals.push_back(base::MakeUnique<autofill::PasswordForm>(local_form));
+  locals.push_back(base::MakeUnique<autofill::PasswordForm>(local_form2));
   autofill::PasswordForm* local_form_ptr = locals[0].get();
   std::vector<std::unique_ptr<autofill::PasswordForm>> federations;
-  federations.push_back(base::WrapUnique(new autofill::PasswordForm(idp_form)));
+  federations.push_back(base::MakeUnique<autofill::PasswordForm>(idp_form));
 
   EXPECT_CALL(prompt, ShowAccountChooser());
   controller().ShowAccountChooser(&prompt,
                                   std::move(locals), std::move(federations));
   EXPECT_THAT(controller().GetLocalForms(), ElementsAre(Pointee(local_form),
                                                         Pointee(local_form2)));
   EXPECT_THAT(controller().GetFederationsForms(),
               ElementsAre(Pointee(idp_form)));
   EXPECT_FALSE(controller().ShouldShowSignInButton());
 
@@ skipping 13 matching lines @@
        password_manager::metrics_util::ACCOUNT_CHOOSER_CREDENTIAL_CHOSEN, 1);
   histogram_tester.ExpectTotalCount(
       "PasswordManager.AccountChooserDialogOneAccount", 0);
 }
 
 TEST_F(PasswordDialogControllerTest, ShowAccountChooserAndSignIn) {
   base::HistogramTester histogram_tester;
   StrictMock<MockPasswordPrompt> prompt;
   autofill::PasswordForm local_form = GetLocalForm();
   std::vector<std::unique_ptr<autofill::PasswordForm>> locals;
-  locals.push_back(base::WrapUnique(new autofill::PasswordForm(local_form)));
+  locals.push_back(base::MakeUnique<autofill::PasswordForm>(local_form));
   std::vector<std::unique_ptr<autofill::PasswordForm>> federations;
 
   EXPECT_CALL(prompt, ShowAccountChooser());
   controller().ShowAccountChooser(&prompt,
                                   std::move(locals), std::move(federations));
   EXPECT_THAT(controller().GetLocalForms(), ElementsAre(Pointee(local_form)));
   EXPECT_THAT(controller().GetFederationsForms(), testing::IsEmpty());
   EXPECT_TRUE(controller().ShouldShowSignInButton());
 
   // Close the dialog.
   EXPECT_CALL(prompt, ControllerGone());
   EXPECT_CALL(ui_controller_mock(), ChooseCredential(
       local_form,
       password_manager::CredentialType::CREDENTIAL_TYPE_PASSWORD));
   controller().OnSignInClicked();
   histogram_tester.ExpectUniqueSample(
       "PasswordManager.AccountChooserDialog",
        password_manager::metrics_util::ACCOUNT_CHOOSER_SIGN_IN, 1);
   histogram_tester.ExpectUniqueSample(
       "PasswordManager.AccountChooserDialogOneAccount",
        password_manager::metrics_util::ACCOUNT_CHOOSER_SIGN_IN, 1);
   histogram_tester.ExpectTotalCount(
       "PasswordManager.AccountChooserDialogMultipleAccounts", 0);
 }
 
 TEST_F(PasswordDialogControllerTest, AccountChooserClosed) {
   base::HistogramTester histogram_tester;
   StrictMock<MockPasswordPrompt> prompt;
   std::vector<std::unique_ptr<autofill::PasswordForm>> locals;
-  locals.push_back(
-      base::WrapUnique(new autofill::PasswordForm(GetLocalForm())));
+  locals.push_back(base::MakeUnique<autofill::PasswordForm>(GetLocalForm()));
   EXPECT_CALL(prompt, ShowAccountChooser());
   controller().ShowAccountChooser(&prompt, std::move(locals),
                                   PasswordDialogController::FormsVector());
 
   EXPECT_CALL(ui_controller_mock(), OnDialogHidden());
   controller().OnCloseDialog();
   histogram_tester.ExpectUniqueSample(
       "PasswordManager.AccountChooserDialog",
        password_manager::metrics_util::ACCOUNT_CHOOSER_DISMISSED, 1);
   histogram_tester.ExpectUniqueSample(
@@ skipping 66 matching lines @@
       "PasswordManager.AutoSigninFirstRunDialog",
        password_manager::metrics_util::AUTO_SIGNIN_TURN_OFF, 1);
 }
 
 TEST_F(PasswordDialogControllerTest, OnBrandLinkClicked) {
   EXPECT_CALL(ui_controller_mock(), NavigateToSmartLockHelpPage());
   controller().OnSmartLockLinkClicked();
 }
 
 }  // namespace