Make PasswordFormManager::best_matches_ const

chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc

 // Copyright 2014 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 <map>
 #include <memory>
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
+#include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/ui/passwords/manage_passwords_bubble_model.h"
 #include "chrome/browser/ui/passwords/manage_passwords_icon_view.h"
 #include "chrome/browser/ui/passwords/manage_passwords_ui_controller_mock.h"
 #include "chrome/browser/ui/passwords/password_dialog_controller.h"
 #include "chrome/browser/ui/passwords/password_dialog_prompts.h"
 #include "chrome/browser/ui/passwords/passwords_model_delegate.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
@@ skipping 246 matching lines @@
   EXPECT_CALL(*controller(), OnUpdateBubbleAndIconVisibility());
   if (state == password_manager::ui::PENDING_PASSWORD_STATE)
     controller()->OnPasswordSubmitted(std::move(test_form_manager));
   else if (state == password_manager::ui::PENDING_PASSWORD_UPDATE_STATE)
     controller()->OnUpdatePasswordSubmitted(std::move(test_form_manager));
   else // password_manager::ui::CONFIRMATION_STATE
     controller()->OnAutomaticPasswordSave(std::move(test_form_manager));
   ASSERT_EQ(state, controller()->GetState());
 
   // Autofill happens.
-  std::unique_ptr<autofill::PasswordForm> test_form(
-      new autofill::PasswordForm(test_local_form()));
-  autofill::PasswordFormMap map;
+  std::map<base::string16, const autofill::PasswordForm*> map;
   map.insert(
-      std::make_pair(test_local_form().username_value, std::move(test_form)));
+      std::make_pair(test_local_form().username_value, &test_local_form()));
   controller()->OnPasswordAutofilled(map, map.begin()->second->origin, nullptr);
 
   // State shouldn't changed.
   EXPECT_EQ(state, controller()->GetState());
   ExpectIconStateIs(state);
 }
 
 TEST_F(ManagePasswordsUIControllerTest, DefaultState) {
   EXPECT_EQ(password_manager::ui::INACTIVE_STATE, controller()->GetState());
   EXPECT_EQ(GURL::EmptyGURL(), controller()->GetOrigin());
 
   ExpectIconStateIs(password_manager::ui::INACTIVE_STATE);
 }
 
 TEST_F(ManagePasswordsUIControllerTest, PasswordAutofilled) {
-  std::unique_ptr<autofill::PasswordForm> test_form(
-      new autofill::PasswordForm(test_local_form()));
-  autofill::PasswordForm* test_form_ptr = test_form.get();
-  base::string16 kTestUsername = test_form->username_value;
-  autofill::PasswordFormMap map;
-  map.insert(std::make_pair(kTestUsername, std::move(test_form)));
+  const autofill::PasswordForm* test_form_ptr = &test_local_form();
+  base::string16 kTestUsername = test_form_ptr->username_value;
+  std::map<base::string16, const autofill::PasswordForm*> map;
+  map.insert(std::make_pair(kTestUsername, test_form_ptr));
   EXPECT_CALL(*controller(), OnUpdateBubbleAndIconVisibility());
   controller()->OnPasswordAutofilled(map, map.begin()->second->origin, nullptr);
 
   EXPECT_EQ(password_manager::ui::MANAGE_STATE, controller()->GetState());
   EXPECT_EQ(test_form_ptr->origin, controller()->GetOrigin());
   ASSERT_EQ(1u, controller()->GetCurrentForms().size());
   EXPECT_EQ(kTestUsername, controller()->GetCurrentForms()[0]->username_value);
 
   // Controller should store a separate copy of the form as it doesn't own it.
   EXPECT_NE(test_form_ptr, controller()->GetCurrentForms()[0].get());
@@ skipping 166 matching lines @@
   EXPECT_CALL(*controller(), OnUpdateBubbleAndIconVisibility());
   controller()->OnPasswordSubmitted(std::move(test_form_manager));
   EXPECT_EQ(password_manager::ui::INACTIVE_STATE, controller()->GetState());
   EXPECT_EQ(GURL::EmptyGURL(), controller()->GetOrigin());
 
   ExpectIconStateIs(password_manager::ui::INACTIVE_STATE);
 }
 
 TEST_F(ManagePasswordsUIControllerTest, BlacklistedElsewhere) {
   base::string16 kTestUsername = base::ASCIIToUTF16("test_username");
-  autofill::PasswordFormMap map;
-  map.insert(std::make_pair(
-      kTestUsername,
-      base::WrapUnique(new autofill::PasswordForm(test_local_form()))));
+  std::map<base::string16, const autofill::PasswordForm*> map;
+  map.insert(std::make_pair(kTestUsername, &test_local_form()));
   EXPECT_CALL(*controller(), OnUpdateBubbleAndIconVisibility());
   controller()->OnPasswordAutofilled(map, map.begin()->second->origin, nullptr);
 
   test_local_form().blacklisted_by_user = true;
   password_manager::PasswordStoreChange change(
       password_manager::PasswordStoreChange::ADD, test_local_form());
   password_manager::PasswordStoreChangeList list(1, change);
   controller()->OnLoginsChanged(list);
 
   EXPECT_EQ(password_manager::ui::MANAGE_STATE, controller()->GetState());
@@ skipping 127 matching lines @@
       Return(&dialog_prompt()));
   EXPECT_CALL(dialog_prompt(), ShowAutoSigninPrompt());
   controller()->OnPromptEnableAutoSignin();
 
   EXPECT_EQ(password_manager::ui::INACTIVE_STATE, controller()->GetState());
   EXPECT_CALL(dialog_prompt(), ControllerGone());
 }
 
 TEST_F(ManagePasswordsUIControllerTest, AutoSigninFirstRunAfterAutofill) {
   // Setup the managed state first.
-  std::unique_ptr<autofill::PasswordForm> test_form(
-      new autofill::PasswordForm(test_local_form()));
-  autofill::PasswordForm* test_form_ptr = test_form.get();
-  const base::string16 kTestUsername = test_form->username_value;
-  autofill::PasswordFormMap map;
-  map.insert(std::make_pair(kTestUsername, std::move(test_form)));
+  const autofill::PasswordForm* test_form_ptr = &test_local_form();
+  const base::string16 kTestUsername = test_form_ptr->username_value;
+  std::map<base::string16, const autofill::PasswordForm*> map;
+  map.insert(std::make_pair(kTestUsername, test_form_ptr));
   EXPECT_CALL(*controller(), OnUpdateBubbleAndIconVisibility());
   controller()->OnPasswordAutofilled(map, test_form_ptr->origin, nullptr);
   EXPECT_EQ(password_manager::ui::MANAGE_STATE, controller()->GetState());
 
   // Pop up the autosignin promo. The state should stay intact.
   EXPECT_CALL(*controller(), CreateAutoSigninPrompt(_)).WillOnce(
       Return(&dialog_prompt()));
   EXPECT_CALL(dialog_prompt(), ShowAutoSigninPrompt());
   controller()->OnPromptEnableAutoSignin();
 
@@ skipping 21 matching lines @@
   EXPECT_CALL(dialog_prompt(), ControllerGone());
 }
 
 TEST_F(ManagePasswordsUIControllerTest, AutofillDuringAutoSignin) {
   std::vector<std::unique_ptr<autofill::PasswordForm>> local_credentials;
   local_credentials.emplace_back(new autofill::PasswordForm(test_local_form()));
   EXPECT_CALL(*controller(), OnUpdateBubbleAndIconVisibility());
   controller()->OnAutoSignin(std::move(local_credentials),
                              test_local_form().origin);
   ExpectIconAndControllerStateIs(password_manager::ui::AUTO_SIGNIN_STATE);
-  std::unique_ptr<autofill::PasswordForm> test_form(
-      new autofill::PasswordForm(test_local_form()));
-  autofill::PasswordFormMap map;
-  base::string16 kTestUsername = test_form->username_value;
-  map.insert(std::make_pair(kTestUsername, std::move(test_form)));
+  std::map<base::string16, const autofill::PasswordForm*> map;
+  base::string16 kTestUsername = test_local_form().username_value;
+  map.insert(std::make_pair(kTestUsername, &test_local_form()));
   controller()->OnPasswordAutofilled(map, map.begin()->second->origin, nullptr);
 
   ExpectIconAndControllerStateIs(password_manager::ui::AUTO_SIGNIN_STATE);
 }
 
 TEST_F(ManagePasswordsUIControllerTest, InactiveOnPSLMatched) {
   base::string16 kTestUsername = base::ASCIIToUTF16("test_username");
-  autofill::PasswordFormMap map;
-  std::unique_ptr<autofill::PasswordForm> psl_matched_test_form(
-      new autofill::PasswordForm(test_local_form()));
-  psl_matched_test_form->is_public_suffix_match = true;
-  map.insert(std::make_pair(kTestUsername, std::move(psl_matched_test_form)));
+  std::map<base::string16, const autofill::PasswordForm*> map;
+  autofill::PasswordForm psl_matched_test_form(test_local_form());
+  psl_matched_test_form.is_public_suffix_match = true;
+  map.insert(std::make_pair(kTestUsername, &psl_matched_test_form));
   EXPECT_CALL(*controller(), OnUpdateBubbleAndIconVisibility());
   controller()->OnPasswordAutofilled(map, map.begin()->second->origin, nullptr);
 
   EXPECT_EQ(password_manager::ui::INACTIVE_STATE, controller()->GetState());
 }
 
 TEST_F(ManagePasswordsUIControllerTest, UpdatePasswordSubmitted) {
   std::unique_ptr<password_manager::PasswordFormManager> test_form_manager(
       CreateFormManager());
   EXPECT_CALL(*controller(), OnUpdateBubbleAndIconVisibility());
@@ skipping 47 matching lines @@
   // Open the bubble again.
   local_credentials.emplace_back(new autofill::PasswordForm(test_local_form()));
   EXPECT_CALL(*controller(), OnUpdateBubbleAndIconVisibility());
   controller()->OnAutoSignin(std::move(local_credentials),
                              test_local_form().origin);
   EXPECT_EQ(password_manager::ui::AUTO_SIGNIN_STATE, controller()->GetState());
   // Check the delegate is destroyed. Thus, the first bubble has no way to mess
   // up with the controller's state.
   EXPECT_FALSE(proxy_delegate);
 }