chrome/browser/password_manager: scoped_ptr -> unique_ptr

chrome/browser/password_manager/save_password_infobar_delegate_unittest.cc

Index: chrome/browser/password_manager/save_password_infobar_delegate_unittest.cc
diff --git a/chrome/browser/password_manager/save_password_infobar_delegate_unittest.cc b/chrome/browser/password_manager/save_password_infobar_delegate_unittest.cc
index 5993b9921732678665b1ca1eb61b3cb1626858fe..25698d1cf8cfe265b523c45eda4d68e3ce83d1fb 100644
--- a/chrome/browser/password_manager/save_password_infobar_delegate_unittest.cc
+++ b/chrome/browser/password_manager/save_password_infobar_delegate_unittest.cc
@@ -45,7 +45,7 @@ class TestSavePasswordInfobarDelegate : public SavePasswordInfoBarDelegate {
  public:
   TestSavePasswordInfobarDelegate(
       content::WebContents* web_contents,
-      scoped_ptr<password_manager::PasswordFormManager> form_to_save,
+      std::unique_ptr<password_manager::PasswordFormManager> form_to_save,
       bool should_show_first_run_experience)
       : SavePasswordInfoBarDelegate(web_contents,
                                     std::move(form_to_save),
@@ -67,11 +67,12 @@ class SavePasswordInfoBarDelegateTest : public ChromeRenderViewHostTestHarness {
 
   PrefService* prefs();
   const autofill::PasswordForm& test_form() { return test_form_; }
-  scoped_ptr<MockPasswordFormManager> CreateMockFormManager();
+  std::unique_ptr<MockPasswordFormManager> CreateMockFormManager();
 
  protected:
-  scoped_ptr<ConfirmInfoBarDelegate> CreateDelegate(
-      scoped_ptr<password_manager::PasswordFormManager> password_form_manager,
+  std::unique_ptr<ConfirmInfoBarDelegate> CreateDelegate(
+      std::unique_ptr<password_manager::PasswordFormManager>
+          password_form_manager,
       bool should_show_first_run_experience);
 
   password_manager::StubPasswordManagerClient client_;
@@ -97,20 +98,21 @@ PrefService* SavePasswordInfoBarDelegateTest::prefs() {
   return profile->GetPrefs();
 }
 
-scoped_ptr<MockPasswordFormManager>
+std::unique_ptr<MockPasswordFormManager>
 SavePasswordInfoBarDelegateTest::CreateMockFormManager() {
-  return scoped_ptr<MockPasswordFormManager>(new MockPasswordFormManager(
+  return std::unique_ptr<MockPasswordFormManager>(new MockPasswordFormManager(
       &password_manager_, &client_, driver_.AsWeakPtr(), test_form()));
 }
 
-scoped_ptr<ConfirmInfoBarDelegate>
+std::unique_ptr<ConfirmInfoBarDelegate>
 SavePasswordInfoBarDelegateTest::CreateDelegate(
-    scoped_ptr<password_manager::PasswordFormManager> password_form_manager,
+    std::unique_ptr<password_manager::PasswordFormManager>
+        password_form_manager,
     bool should_show_first_run_experience) {
-  scoped_ptr<ConfirmInfoBarDelegate> delegate(
-      new TestSavePasswordInfobarDelegate(
-          web_contents(), std::move(password_form_manager),
-          should_show_first_run_experience));
+  std::unique_ptr<ConfirmInfoBarDelegate> delegate(
+      new TestSavePasswordInfobarDelegate(web_contents(),
+                                          std::move(password_form_manager),
+                                          should_show_first_run_experience));
   return delegate;
 }
 
@@ -123,20 +125,20 @@ void SavePasswordInfoBarDelegateTest::TearDown() {
 }
 
 TEST_F(SavePasswordInfoBarDelegateTest, CancelTestCredentialSourceAPI) {
-  scoped_ptr<MockPasswordFormManager> password_form_manager(
+  std::unique_ptr<MockPasswordFormManager> password_form_manager(
       CreateMockFormManager());
   EXPECT_CALL(*password_form_manager.get(), PermanentlyBlacklist());
-  scoped_ptr<ConfirmInfoBarDelegate> infobar(
+  std::unique_ptr<ConfirmInfoBarDelegate> infobar(
       CreateDelegate(std::move(password_form_manager), false));
   EXPECT_TRUE(infobar->Cancel());
 }
 
 TEST_F(SavePasswordInfoBarDelegateTest,
        CancelTestCredentialSourcePasswordManager) {
-  scoped_ptr<MockPasswordFormManager> password_form_manager(
+  std::unique_ptr<MockPasswordFormManager> password_form_manager(
       CreateMockFormManager());
   EXPECT_CALL(*password_form_manager.get(), PermanentlyBlacklist());
-  scoped_ptr<ConfirmInfoBarDelegate> infobar(
+  std::unique_ptr<ConfirmInfoBarDelegate> infobar(
       CreateDelegate(std::move(password_form_manager), false));
   EXPECT_TRUE(infobar->Cancel());
 }
@@ -146,9 +148,9 @@ TEST_F(SavePasswordInfoBarDelegateTest,
   using password_manager::CredentialSourceType;
   prefs()->SetBoolean(
       password_manager::prefs::kWasSavePrompFirstRunExperienceShown, false);
-  scoped_ptr<MockPasswordFormManager> password_form_manager(
+  std::unique_ptr<MockPasswordFormManager> password_form_manager(
       CreateMockFormManager());
-  scoped_ptr<ConfirmInfoBarDelegate> infobar(
+  std::unique_ptr<ConfirmInfoBarDelegate> infobar(
       CreateDelegate(std::move(password_form_manager), true));
   EXPECT_TRUE(infobar->Cancel());
   infobar.reset();
@@ -161,9 +163,9 @@ TEST_F(SavePasswordInfoBarDelegateTest,
   using password_manager::CredentialSourceType;
   prefs()->SetBoolean(
       password_manager::prefs::kWasSavePrompFirstRunExperienceShown, false);
-  scoped_ptr<MockPasswordFormManager> password_form_manager(
+  std::unique_ptr<MockPasswordFormManager> password_form_manager(
       CreateMockFormManager());
-  scoped_ptr<ConfirmInfoBarDelegate> infobar(
+  std::unique_ptr<ConfirmInfoBarDelegate> infobar(
       CreateDelegate(std::move(password_form_manager), false));
   EXPECT_TRUE(infobar->Cancel());
   infobar.reset();