Add metrics for PasswordForm submission types

chrome/renderer/autofill/password_autofill_agent_browsertest.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/autofill/content/renderer/password_autofill_agent.h"
 
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
@@ skipping 489 matching lines @@
       const std::string& password_value,
       const std::string& new_password_value) {
     base::RunLoop().RunUntilIdle();
     ASSERT_TRUE(fake_driver_.called_password_form_submitted());
     ASSERT_TRUE(static_cast<bool>(fake_driver_.password_form_submitted()));
     const autofill::PasswordForm& form =
         *(fake_driver_.password_form_submitted());
     EXPECT_EQ(ASCIIToUTF16(username_value), form.username_value);
     EXPECT_EQ(ASCIIToUTF16(password_value), form.password_value);
     EXPECT_EQ(ASCIIToUTF16(new_password_value), form.new_password_value);
+    EXPECT_EQ(PasswordForm::SubmissionIndicatorEvent::HTML_FORM_SUBMISSION,
+              form.submission_event);
   }
 
   void ExpectFieldPropertiesMasks(
       PasswordFormSourceType expected_type,
       const std::map<base::string16, FieldPropertiesMask>&
           expected_properties_masks) {
     base::RunLoop().RunUntilIdle();
     autofill::PasswordForm form;
     if (expected_type == PasswordFormSubmitted) {
       ASSERT_TRUE(fake_driver_.called_password_form_submitted());
@@ skipping 16 matching lines @@
           << "Wrong mask for the field " << field.name;
       unchecked_masks--;
     }
     EXPECT_TRUE(unchecked_masks == 0)
         << "Some expected masks are missed in FormData";
   }
 
   void ExpectInPageNavigationWithUsernameAndPasswords(
       const std::string& username_value,
       const std::string& password_value,
-      const std::string& new_password_value) {
+      const std::string& new_password_value,
+      PasswordForm::SubmissionIndicatorEvent event) {
     base::RunLoop().RunUntilIdle();
     ASSERT_TRUE(fake_driver_.called_inpage_navigation());
     ASSERT_TRUE(
         static_cast<bool>(fake_driver_.password_form_inpage_navigation()));
     const autofill::PasswordForm& form =
         *(fake_driver_.password_form_inpage_navigation());
     EXPECT_EQ(ASCIIToUTF16(username_value), form.username_value);
     EXPECT_EQ(ASCIIToUTF16(password_value), form.password_value);
     EXPECT_EQ(ASCIIToUTF16(new_password_value), form.new_password_value);
+    EXPECT_EQ(event, form.submission_event);
   }
 
   void CheckIfEventsAreCalled(const std::vector<base::string16>& checkers,
                               bool expected) {
     for (const base::string16& variable : checkers) {
       int value;
       EXPECT_TRUE(ExecuteJavaScriptAndReturnIntValue(variable, &value))
           << variable;
       EXPECT_EQ(expected, value == 1) << variable;
     }
@@ skipping 1676 matching lines @@
   UpdateUsernameAndPasswordElements();
 
   SimulateUsernameChange("Bob");
   SimulatePasswordChange("mypassword");
 
   username_element_.SetAttribute("style", "display:none;");
   password_element_.SetAttribute("style", "display:none;");
 
   password_autofill_agent_->AJAXSucceeded();
 
-  ExpectInPageNavigationWithUsernameAndPasswords("Bob", "mypassword", "");
+  ExpectInPageNavigationWithUsernameAndPasswords(
+      "Bob", "mypassword", "",
+      PasswordForm::SubmissionIndicatorEvent::XHR_SUCCEEDED);
 }
 
 TEST_F(PasswordAutofillAgentTest,
        NoForm_NoPromptForAJAXSubmitWithoutNavigationAndElementsVisible) {
   LoadHTML(kNoFormHTML);
   UpdateUsernameAndPasswordElements();
 
   SimulateUsernameChange("Bob");
   SimulatePasswordChange("mypassword");
 
@@ skipping 270 matching lines @@
   SimulateUsernameChange("Bob");
   SimulatePasswordChange("mypassword");
   SimulateUsernameChange("Alice");
 
   // Hide form elements to simulate successful login.
   username_element_.SetAttribute("style", "display:none;");
   password_element_.SetAttribute("style", "display:none;");
 
   password_autofill_agent_->AJAXSucceeded();
 
-  ExpectInPageNavigationWithUsernameAndPasswords("Alice", "mypassword", "");
+  ExpectInPageNavigationWithUsernameAndPasswords(
+      "Alice", "mypassword", "",
+      PasswordForm::SubmissionIndicatorEvent::XHR_SUCCEEDED);
 }
 
 TEST_F(PasswordAutofillAgentTest,
        UsernameChangedAfterPasswordInput_FormSubmitted) {
   SimulateUsernameChange("Bob");
   SimulatePasswordChange("mypassword");
   SimulateUsernameChange("Alice");
 
   static_cast<content::RenderFrameObserver*>(password_autofill_agent_)
       ->WillSendSubmitEvent(username_element_.Form());
@@ skipping 141 matching lines @@
 
   // Simulate that JavaScript removes the submitted form from DOM. That means
   // that a submission was successful.
   std::string remove_form =
       "var form = document.getElementById('LoginTestForm');"
       "form.parentNode.removeChild(form);";
   ExecuteJavaScriptForTests(remove_form.c_str());
 
   static_cast<content::RenderFrameObserver*>(password_autofill_agent_)
       ->DidCommitProvisionalLoad(false, true);
-  base::RunLoop().RunUntilIdle();
-
-  // Chect that the form was submitted with in-page navigation.
-  EXPECT_TRUE(fake_driver_.called_inpage_navigation());
-  EXPECT_EQ(base::string16(),
-            fake_driver_.password_form_inpage_navigation()->username_value);
-  EXPECT_EQ(ASCIIToUTF16("random"),
-            fake_driver_.password_form_inpage_navigation()->password_value);
+  ExpectInPageNavigationWithUsernameAndPasswords(
+      std::string(), "random", std::string(),
+      PasswordForm::SubmissionIndicatorEvent::INPAGE_NAVIGATION);
 }
 
 #if defined(SAFE_BROWSING_DB_LOCAL)
 // Verify CheckSafeBrowsingReputation() is called when user starts filling
 // username or password field, and that this function is only called once.
 TEST_F(PasswordAutofillAgentTest,
        CheckSafeBrowsingReputationWhenUserStartsFillingUsernamePassword) {
   ASSERT_EQ(0, fake_driver_.called_check_safe_browsing_reputation_cnt());
   // Simulate a click on password field to set its on focus,
   // CheckSafeBrowsingReputation() should be called.
@@ skipping 11 matching lines @@
 
   // Navigate to another page and click on username field,
   // CheckSafeBrowsingReputation() should be triggered again.
   LoadHTML(kFormHTML);
   SimulateElementClick(kUsernameName);
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(2, fake_driver_.called_check_safe_browsing_reputation_cnt());
 }
 #endif
 }  // namespace autofill