Get rid of the timeouts in CredentialManagerBrowserTest.*

chrome/browser/password_manager/credential_manager_browsertest.cc

 // Copyright 2016 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 "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/password_manager/password_manager_test_base.h"
 #include "chrome/browser/password_manager/password_store_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 126 matching lines @@
   // Enable 'auto signin' for the profile.
   password_bubble_experiment::RecordAutoSignInPromptFirstRunExperienceWasShown(
       browser()->profile()->GetPrefs());
 
   NavigateToFile("/password/password_form.html");
   std::string fill_password =
   "document.getElementById('username_field').value = 'trash';"
   "document.getElementById('password_field').value = 'trash';";
   ASSERT_TRUE(content::ExecuteScript(RenderViewHost(), fill_password));
 
-  // Call the API with a delay to trigger the notification to the client. The
-  // delay ensures that parsing password forms won't happen again after the API
-  // call making the test flaky.
+  // Call the API to trigger the notification to the client.
   ASSERT_TRUE(content::ExecuteScript(
       RenderViewHost(),
-      "setTimeout( function() {"
-        "navigator.credentials.get({password: true})"
-        ".then(cred => window.location = '/password/done.html');"
-      "}, 1000)"));
+      "navigator.credentials.get({password: true})"
+      ".then(cred => window.location = '/password/done.html');"));
 
   NavigationObserver observer(WebContents());
   observer.SetPathToWaitFor("/password/done.html");
   observer.Wait();
 
   std::unique_ptr<BubbleObserver> prompt_observer(
       new BubbleObserver(WebContents()));
-  // The autofill password manager shouldn't react to the successful login.
+  // The autofill password manager shouldn't react to the successful login
+  // because it was suppressed when the site got the credential back.
   EXPECT_FALSE(prompt_observer->IsShowingSavePrompt());
 }
 
 IN_PROC_BROWSER_TEST_F(CredentialManagerBrowserTest, SaveViaAPIAndAutofill) {
   NavigateToFile("/password/password_form.html");
 
-  // Postpone a submit event for 1 second. Even for the static html page Chrome
-  // continues to parse and recreate the PasswordFormManager instances after the
-  // page load. Calling the API before this would make the test flaky. Clicking
-  // on the button emulates server analysing the credential and then saving and
-  // navigating to the landing page.
   ASSERT_TRUE(content::ExecuteScript(
       RenderViewHost(),
       "document.getElementById('input_submit_button').addEventListener('click',"
       "function(event) {"
-        "setTimeout( function() {"
-          "var c = new PasswordCredential({ id: 'user', password: 'API' });"
-          "navigator.credentials.store(c);"
-          "document.getElementById('testform').submit();"
-        "}, 1000 );"
-        "event.preventDefault();"
+        "var c = new PasswordCredential({ id: 'user', password: 'API' });"
+        "navigator.credentials.store(c);"
       "});"));
-  // Fill the password and click the button to submit the page later. The API
-  // should suppress the autofill password manager.
+  // Fill the password and click the button to submit the page. The API should
+  // suppress the autofill password manager.
   NavigationObserver form_submit_observer(WebContents());
   ASSERT_TRUE(content::ExecuteScript(
       RenderViewHost(),
       "document.getElementById('username_field').value = 'user';"
       "document.getElementById('password_field').value = 'autofill';"
       "document.getElementById('input_submit_button').click();"));
   form_submit_observer.Wait();
 
   WaitForPasswordStore();
   std::unique_ptr<BubbleObserver> prompt_observer(
@@ skipping 27 matching lines @@
   signin_form.signon_realm = embedded_test_server()->base_url().spec();
   signin_form.password_value = base::ASCIIToUTF16("old_pass");
   signin_form.username_value = base::ASCIIToUTF16("user");
   signin_form.origin = embedded_test_server()->base_url();
   signin_form.skip_zero_click = true;
   signin_form.preferred = true;
   password_store->AddLogin(signin_form);
 
   NavigateToFile("/password/password_form.html");
 
-  // Postpone a submit event for 1 second. Even for the static html page Chrome
-  // continues to parse and recreate the PasswordFormManager instances after the
-  // page load. Calling the API before this would make the test flaky. Clicking
-  // on the button emulates server analysing the credential and then saving and
-  // navigating to the landing page.
   ASSERT_TRUE(content::ExecuteScript(
       RenderViewHost(),
       "document.getElementById('input_submit_button').addEventListener('click',"
       "function(event) {"
-        "setTimeout( function() {"
-          "var c = new PasswordCredential({ id: 'user', password: 'API' });"
-          "navigator.credentials.store(c);"
-          "document.getElementById('testform').submit();"
-        "}, 1000 );"
-        "event.preventDefault();"
+        "var c = new PasswordCredential({ id: 'user', password: 'API' });"
+        "navigator.credentials.store(c);"
       "});"));
   // Fill the new password and click the button to submit the page later. The
   // API should suppress the autofill password manager and overwrite the
   // password.
   NavigationObserver form_submit_observer(WebContents());
   ASSERT_TRUE(content::ExecuteScript(
       RenderViewHost(),
       "document.getElementById('username_field').value = 'user';"
       "document.getElementById('password_field').value = 'autofill';"
       "document.getElementById('input_submit_button').click();"));
   form_submit_observer.Wait();
 
   // Wait for the password store before checking the prompt because it pops up
   // after the store replies.
   WaitForPasswordStore();
   std::unique_ptr<BubbleObserver> prompt_observer(
       new BubbleObserver(WebContents()));
   EXPECT_FALSE(prompt_observer->IsShowingSavePrompt());
   EXPECT_FALSE(prompt_observer->IsShowingUpdatePrompt());
   signin_form.skip_zero_click = false;
   signin_form.times_used = 1;
   signin_form.password_value = base::ASCIIToUTF16("API");
   password_manager::TestPasswordStore::PasswordMap stored =
       password_store->stored_passwords();
   ASSERT_EQ(1u, stored.size());
   EXPECT_EQ(signin_form, stored[signin_form.signon_realm][0]);
 }
 
 }  // namespace