Removing PasswordForm::password_auto_complete_set

components/password_manager/core/browser/password_manager_unittest.cc

 // Copyright (c) 2012 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 "components/password_manager/core/browser/password_manager.h"
 
 #include <string>
 #include <vector>
 
 #include "base/message_loop/message_loop.h"
@@ skipping 114 matching lines @@
   }
 
   PasswordForm MakeSimpleForm() {
     PasswordForm form;
     form.origin = GURL("http://www.google.com/a/LoginAuth");
     form.action = GURL("http://www.google.com/a/Login");
     form.username_element = ASCIIToUTF16("Email");
     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;
   }
 
   // Create a sign-up form that only has a new password field.
   PasswordForm MakeFormWithOnlyNewPasswordField() {
     PasswordForm form = MakeSimpleForm();
     form.new_password_element.swap(form.password_element);
     form.new_password_value.swap(form.password_value);
     return form;
   }
 
   // Reproduction of the form present on twitter's login page.
   PasswordForm MakeTwitterLoginForm() {
     PasswordForm form;
     form.origin = GURL("https://twitter.com/");
     form.action = GURL("https://twitter.com/sessions");
     form.username_element = ASCIIToUTF16("Email");
     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;
   }
 
   // Reproduction of the form present on twitter's failed login page.
   PasswordForm MakeTwitterFailedLoginForm() {
     PasswordForm form;
     form.origin = GURL("https://twitter.com/login/error?redirect_after_login");
     form.action = GURL("https://twitter.com/sessions");
     form.username_element = ASCIIToUTF16("EmailField");
     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;
   }
 
   PasswordForm MakeSimpleFormWithOnlyPasswordField() {
     PasswordForm form(MakeSimpleForm());
     form.username_element.clear();
     form.username_value.clear();
     return form;
@@ skipping 10 matching lines @@
     if (lhs.password_element != rhs.password_element)
       return false;
     if (lhs.new_password_element != rhs.new_password_element)
       return false;
     if (lhs.username_value != rhs.username_value)
       return false;
     if (lhs.password_value != rhs.password_value)
       return false;
     if (lhs.new_password_value != rhs.new_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)
       return false;
     return true;
   }
 
   TestPasswordManager* manager() { return manager_.get(); }
 
   void OnPasswordFormSubmitted(const autofill::PasswordForm& form) {
@@ skipping 17 matching lines @@
   scoped_ptr<TestPasswordManager> manager_;
   PasswordForm submitted_form_;
 };
 
 MATCHER_P(FormMatches, form, "") {
   return form.signon_realm == arg.signon_realm && form.origin == arg.origin &&
          form.action == arg.action &&
          form.username_element == arg.username_element &&
          form.password_element == arg.password_element &&
          form.new_password_element == arg.new_password_element &&
-         form.password_autocomplete_set == arg.password_autocomplete_set &&
          form.submit_element == arg.submit_element;
 }
 
 TEST_F(PasswordManagerTest, FormSubmitEmptyStore) {
   // Test that observing a newly submitted form shows the save password bar.
   EXPECT_CALL(driver_, FillPasswordForm(_)).Times(Exactly(0));
   std::vector<PasswordForm> observed;
   PasswordForm form(MakeSimpleForm());
   observed.push_back(form);
   // The initial load.
@@ skipping 333 matching lines @@
   EXPECT_CALL(driver_, FillPasswordForm(_));
   EXPECT_CALL(*store_,
               GetLogins(_, testing::Eq(PasswordStore::DISALLOW_PROMPT), _))
       .WillOnce(WithArg<2>(InvokeConsumer(&result)));
   std::vector<PasswordForm> observed;
   PasswordForm form(MakeSimpleForm());
   observed.push_back(form);
   manager()->OnPasswordFormsParsed(&driver_, observed);
 }
 
 TEST_F(PasswordManagerTest, FormSavedWithAutocompleteOff) {

[vabr (Chromium), 2015/06/19 16:25:11]

Please delete this test completely.
Without the autocomplete bit, this is basically the same as
FormSubmitEmptyStore.

   // Test password form with non-generated password will be saved even if
   // autocomplete=off.
   EXPECT_CALL(driver_, FillPasswordForm(_)).Times(Exactly(0));
   std::vector<PasswordForm> observed;
   PasswordForm form(MakeSimpleForm());
-  form.password_autocomplete_set = false;
   observed.push_back(form);
   manager()->OnPasswordFormsParsed(&driver_, observed);  // The initial load.
   manager()->OnPasswordFormsRendered(&driver_, observed,
                                      true);  // The initial layout.
 
   // And the form submit contract is to call ProvisionallySavePassword.
   manager()->ProvisionallySavePassword(form);
 
   // Password form should be saved.
   scoped_ptr<PasswordFormManager> form_to_save;
   EXPECT_CALL(client_,
               PromptUserToSavePasswordPtr(
                   _, CredentialSourceType::CREDENTIAL_SOURCE_PASSWORD_MANAGER))
       .Times(Exactly(1))
       .WillOnce(WithArg<0>(SaveToScopedPtr(&form_to_save)));
   EXPECT_CALL(*store_, AddLogin(FormMatches(form))).Times(Exactly(0));
 
   // Now the password manager waits for the navigation to complete.
   observed.clear();
   manager()->OnPasswordFormsParsed(&driver_,
                                    observed);  // The post-navigation load.
   manager()->OnPasswordFormsRendered(&driver_, observed,
                                      true);  // The post-navigation layout.
 
   ASSERT_TRUE(form_to_save.get());
 }
 
 TEST_F(PasswordManagerTest, GeneratedPasswordFormSavedAutocompleteOff) {

[vabr (Chromium), 2015/06/19 16:25:11]

Remove this test completely, it is the same as
GeneratedPasswordFormSubmitEmptyStore.

   // Test password form with generated password will still be saved if
   // autocomplete=off.
   EXPECT_CALL(driver_, FillPasswordForm(_)).Times(Exactly(0));
   std::vector<PasswordForm> observed;
   PasswordForm form(MakeSimpleForm());
-  form.password_autocomplete_set = false;
   observed.push_back(form);
   manager()->OnPasswordFormsParsed(&driver_, observed);  // The initial load.
   manager()->OnPasswordFormsRendered(&driver_, observed,
                                      true);  // The initial layout.
 
   // Simulate the user generating the password and submitting the form.
   manager()->SetHasGeneratedPasswordForForm(&driver_, form, true);
   manager()->ProvisionallySavePassword(form);
 
   // The user should not be presented with an infobar as they have already given
@@ skipping 50 matching lines @@
 }
 
 TEST_F(PasswordManagerTest, SyncCredentialsNotSaved) {
   EXPECT_CALL(client_, IsSyncAccountCredential(_, _))
       .WillRepeatedly(Return(true));
 
   // Simulate loading a simple form with no existing stored password.
   EXPECT_CALL(driver_, FillPasswordForm(_)).Times(Exactly(0));
   std::vector<PasswordForm> observed;
   PasswordForm form(MakeSimpleForm());
-  form.password_autocomplete_set = false;
   observed.push_back(form);
   manager()->OnPasswordFormsParsed(&driver_, observed);  // The initial load.
   manager()->OnPasswordFormsRendered(&driver_, observed,
                                      true);  // The initial layout.
 
   // User should not be prompted and password should not be saved.
   EXPECT_CALL(client_,
               PromptUserToSavePasswordPtr(
                   _, CredentialSourceType::CREDENTIAL_SOURCE_PASSWORD_MANAGER))
       .Times(Exactly(0));
@@ skipping 382 matching lines @@
   manager()->OnPasswordFormsRendered(&driver_, observed, true);
 
   ASSERT_TRUE(form_to_save);
   EXPECT_CALL(*store_, AddLogin(FormMatches(form)));
 
   // Simulate saving the form, as if the info bar was accepted.
   form_to_save->Save();
 }
 
 }  // namespace password_manager