[Password manager] Recognise squashed login+sign-up forms

components/password_manager/core/browser/password_form_manager_unittest.cc

Index: components/password_manager/core/browser/password_form_manager_unittest.cc
diff --git a/components/password_manager/core/browser/password_form_manager_unittest.cc b/components/password_manager/core/browser/password_form_manager_unittest.cc
index 2e87a7432a5b2d19418e90f560408f1990db141b..286582d23d4c0f2b06140312f4a1813c51850f66 100644
--- a/components/password_manager/core/browser/password_form_manager_unittest.cc
+++ b/components/password_manager/core/browser/password_form_manager_unittest.cc
@@ -1421,6 +1421,7 @@ TEST_F(PasswordFormManagerTest,
   saved_match()->password_value = ASCIIToUTF16("DifferentPassword");
   saved_match()->new_password_element =
       base::ASCIIToUTF16("new_password_field");
+  saved_match()->new_password_value = base::ASCIIToUTF16("new_pwd");
   EXPECT_TRUE(manager.IsIgnorableChangePasswordForm(*saved_match()));
 }
 
@@ -1440,7 +1441,48 @@ TEST_F(PasswordFormManagerTest,
   saved_match()->username_value = ASCIIToUTF16("DifferentUsername");
   saved_match()->new_password_element =
       base::ASCIIToUTF16("new_password_field");
+  saved_match()->new_password_value = base::ASCIIToUTF16("new_pwd");
   EXPECT_TRUE(manager.IsIgnorableChangePasswordForm(*saved_match()));
 }
 
+TEST_F(PasswordFormManagerTest, PasswordToSave_NoElements) {
+  PasswordForm form;
+  EXPECT_TRUE(PasswordFormManager::PasswordToSave(form).empty());
+}
+
+TEST_F(PasswordFormManagerTest, PasswordToSave_NoNewElement) {
+  PasswordForm form;
+  form.password_element = base::ASCIIToUTF16("pwd");
+  base::string16 kValue = base::ASCIIToUTF16("val");
+  form.password_value = kValue;
+  EXPECT_EQ(kValue, PasswordFormManager::PasswordToSave(form));
+}
+
+TEST_F(PasswordFormManagerTest, PasswordToSave_NoOldElement) {
+  PasswordForm form;
+  form.new_password_element = base::ASCIIToUTF16("new_pwd");
+  base::string16 kNewValue = base::ASCIIToUTF16("new_val");
+  form.new_password_value = kNewValue;
+  EXPECT_EQ(kNewValue, PasswordFormManager::PasswordToSave(form));
+}
+
+TEST_F(PasswordFormManagerTest, PasswordToSave_BothButNoNewValue) {
+  PasswordForm form;
+  form.password_element = base::ASCIIToUTF16("pwd");
+  form.new_password_element = base::ASCIIToUTF16("new_pwd");
+  base::string16 kValue = base::ASCIIToUTF16("val");
+  form.password_value = kValue;
+  EXPECT_EQ(kValue, PasswordFormManager::PasswordToSave(form));
+}
+
+TEST_F(PasswordFormManagerTest, PasswordToSave_NewValue) {
+  PasswordForm form;
+  form.password_element = base::ASCIIToUTF16("pwd");
+  form.new_password_element = base::ASCIIToUTF16("new_pwd");
+  form.password_value = base::ASCIIToUTF16("val");
+  base::string16 kNewValue = base::ASCIIToUTF16("new_val");
+  form.new_password_value = kNewValue;
+  EXPECT_EQ(kNewValue, PasswordFormManager::PasswordToSave(form));
+}
+
 }  // namespace password_manager