Ignore autocomplete='off' for usernames and passwords.

chrome/browser/password_manager/password_manager_unittest.cc

Index: chrome/browser/password_manager/password_manager_unittest.cc
diff --git a/chrome/browser/password_manager/password_manager_unittest.cc b/chrome/browser/password_manager/password_manager_unittest.cc
index ff20a0db9708e0dc1561c3633f67ed8ec9743802..f68500c1b4863d6e04a5d0a5e9e1fa4e4797d35b 100644
--- a/chrome/browser/password_manager/password_manager_unittest.cc
+++ b/chrome/browser/password_manager/password_manager_unittest.cc
@@ -101,8 +101,6 @@ class PasswordManagerTest : public ChromeRenderViewHostTestHarness {
     form.password_element = ASCIIToUTF16("Passwd");
     form.username_value = ASCIIToUTF16("google");
     form.password_value = ASCIIToUTF16("password");
-    // Default to true so we only need to add tests in autocomplete=off cases.
-    form.password_autocomplete_set = true;
     form.submit_element = ASCIIToUTF16("signIn");
     form.signon_realm = "http://www.google.com";
     return form;
@@ -117,7 +115,6 @@ class PasswordManagerTest : public ChromeRenderViewHostTestHarness {
     form.password_element = ASCIIToUTF16("Passwd");
     form.username_value = ASCIIToUTF16("twitter");
     form.password_value = ASCIIToUTF16("password");
-    form.password_autocomplete_set = true;
     form.submit_element = ASCIIToUTF16("signIn");
     form.signon_realm = "https://twitter.com";
     return form;
@@ -133,7 +130,6 @@ class PasswordManagerTest : public ChromeRenderViewHostTestHarness {
     form.password_element = ASCIIToUTF16("PasswdField");
     form.username_value = ASCIIToUTF16("twitter");
     form.password_value = ASCIIToUTF16("password");
-    form.password_autocomplete_set = true;
     form.submit_element = ASCIIToUTF16("signIn");
     form.signon_realm = "https://twitter.com";
     return form;
@@ -153,8 +149,6 @@ class PasswordManagerTest : public ChromeRenderViewHostTestHarness {
       return false;
     if (lhs.password_value != rhs.password_value)
       return false;
-    if (lhs.password_autocomplete_set != rhs.password_autocomplete_set)
-      return false;
     if (lhs.submit_element != rhs.submit_element)
       return false;
     if (lhs.signon_realm != rhs.signon_realm)
@@ -191,8 +185,6 @@ MATCHER_P(FormMatches, form, "") {
          form.action == arg.action &&
          form.username_element == arg.username_element &&
          form.password_element == arg.password_element &&
-         form.password_autocomplete_set ==
-             arg.password_autocomplete_set &&
          form.submit_element == arg.submit_element;
 }
 
@@ -502,65 +494,6 @@ TEST_F(PasswordManagerTest, FillPasswordsOnDisabledManager) {
   manager()->OnPasswordFormsParsed(observed);
 }
 
-TEST_F(PasswordManagerTest, FormNotSavedAutocompleteOff) {
-  // Test password form with non-generated password will not be saved if
-  // autocomplete=off.
-  std::vector<PasswordForm*> result;  // Empty password store.
-  EXPECT_CALL(delegate_, FillPasswordForm(_)).Times(Exactly(0));
-  EXPECT_CALL(*store_.get(), GetLogins(_, _))
-      .WillOnce(DoAll(WithArg<1>(InvokeConsumer(result)), Return(1)));
-  std::vector<PasswordForm> observed;
-  PasswordForm form(MakeSimpleForm());
-  form.password_autocomplete_set = false;
-  observed.push_back(form);
-  manager()->OnPasswordFormsParsed(observed);  // The initial load.
-  manager()->OnPasswordFormsRendered(observed);  // The initial layout.
-
-  // And the form submit contract is to call ProvisionallySavePassword.
-  manager()->ProvisionallySavePassword(form);
-
-  // Password form should not be saved.
-  EXPECT_CALL(delegate_,
-              AddSavePasswordInfoBarIfPermitted(_)).Times(Exactly(0));
-  EXPECT_CALL(*store_.get(), AddLogin(FormMatches(form))).Times(Exactly(0));
-
-  // Now the password manager waits for the navigation to complete.
-  observed.clear();
-  manager()->OnPasswordFormsParsed(observed);  // The post-navigation load.
-  manager()->OnPasswordFormsRendered(observed);  // The post-navigation layout.
-}
-
-TEST_F(PasswordManagerTest, GeneratedPasswordFormSavedAutocompleteOff) {
-  // Test password form with generated password will still be saved if
-  // autocomplete=off.
-  std::vector<PasswordForm*> result;  // Empty password store.
-  EXPECT_CALL(delegate_, FillPasswordForm(_)).Times(Exactly(0));
-  EXPECT_CALL(*store_.get(), GetLogins(_, _))
-      .WillOnce(DoAll(WithArg<1>(InvokeConsumer(result)), Return(1)));
-  std::vector<PasswordForm> observed;
-  PasswordForm form(MakeSimpleForm());
-  form.password_autocomplete_set = false;
-  observed.push_back(form);
-  manager()->OnPasswordFormsParsed(observed);  // The initial load.
-  manager()->OnPasswordFormsRendered(observed);  // The initial layout.
-
-  // Simulate the user generating the password and submitting the form.
-  manager()->SetFormHasGeneratedPassword(form);
-  manager()->ProvisionallySavePassword(form);
-
-  // The user should not be presented with an infobar as they have already given
-  // consent by using the generated password. The form should be saved once
-  // navigation occurs.
-  EXPECT_CALL(delegate_,
-              AddSavePasswordInfoBarIfPermitted(_)).Times(Exactly(0));
-  EXPECT_CALL(*store_.get(), AddLogin(FormMatches(form)));
-
-  // Now the password manager waits for the navigation to complete.
-  observed.clear();
-  manager()->OnPasswordFormsParsed(observed);  // The post-navigation load.
-  manager()->OnPasswordFormsRendered(observed);  // The post-navigation layout.
-}
-
 TEST_F(PasswordManagerTest, SubmissionCallbackTest) {
   manager()->AddSubmissionCallback(SubmissionCallback());
   PasswordForm form = MakeSimpleForm();