[Password Manager] Pass origin of the form which was autofilled in order to display it in managemen…

chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc

Index: chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc
diff --git a/chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc b/chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc
index 4be1ec63b586398523f578625216ab12fbf66f57..fced266455104f7144126dbf8f31f373610bda8f 100644
--- a/chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc
+++ b/chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc
@@ -125,6 +125,10 @@ void TestManagePasswordsUIController::NeverSavePasswordInternal() {
   OnLoginsChanged(list);
 }
 
+GURL OriginFromPasswordFormMap(const autofill::PasswordFormMap& map) {

[vabr (Chromium), 2015/10/13 10:45:20]

Typing
  OriginFromPasswordFormMap(map)
is actually longer than
  map.begin()->second->origin
and the latter makes it clearer what is being done, so I suggest getting rid of
the function.

[melandory, 2015/10/13 13:48:16]

Done.

+  return map.begin()->second->origin;
+}
+
 }  // namespace
 
 class ManagePasswordsUIControllerTest : public ChromeRenderViewHostTestHarness {
@@ -234,7 +238,7 @@ TEST_F(ManagePasswordsUIControllerTest, PasswordAutofilled) {
   base::string16 kTestUsername = test_form->username_value;
   autofill::PasswordFormMap map;
   map.insert(kTestUsername, test_form.Pass());
-  controller()->OnPasswordAutofilled(map);
+  controller()->OnPasswordAutofilled(map, OriginFromPasswordFormMap(map));
 
   EXPECT_EQ(password_manager::ui::MANAGE_STATE, controller()->state());
   EXPECT_FALSE(controller()->PasswordPendingUserDecision());
@@ -381,7 +385,7 @@ TEST_F(ManagePasswordsUIControllerTest, BlacklistedElsewhere) {
   autofill::PasswordFormMap map;
   map.insert(kTestUsername,
              make_scoped_ptr(new autofill::PasswordForm(test_local_form())));
-  controller()->OnPasswordAutofilled(map);
+  controller()->OnPasswordAutofilled(map, OriginFromPasswordFormMap(map));
 
   test_local_form().blacklisted_by_user = true;
   password_manager::PasswordStoreChange change(
@@ -561,7 +565,7 @@ TEST_F(ManagePasswordsUIControllerTest, AutofillDuringAutoSignin) {
   autofill::PasswordFormMap map;
   base::string16 kTestUsername = test_form->username_value;
   map.insert(kTestUsername, test_form.Pass());
-  controller()->OnPasswordAutofilled(map);
+  controller()->OnPasswordAutofilled(map, OriginFromPasswordFormMap(map));
 
   ExpectIconAndControllerStateIs(password_manager::ui::AUTO_SIGNIN_STATE);
 }
@@ -573,7 +577,7 @@ TEST_F(ManagePasswordsUIControllerTest, InactiveOnPSLMatched) {
       new autofill::PasswordForm(test_local_form()));
   psl_matched_test_form->is_public_suffix_match = true;
   map.insert(kTestUsername, psl_matched_test_form.Pass());
-  controller()->OnPasswordAutofilled(map);
+  controller()->OnPasswordAutofilled(map, OriginFromPasswordFormMap(map));
 
   EXPECT_EQ(password_manager::ui::INACTIVE_STATE, controller()->state());
 }