Fix flaky CredentialManagerBrowserTest.AutoSigninOldCredentialAndNavigation.

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 99 matching lines @@
   ASSERT_EQ(1u, passwords_map.size());
   const std::vector<autofill::PasswordForm>& passwords_vector =
       passwords_map.begin()->second;
   ASSERT_EQ(1u, passwords_vector.size());
   const autofill::PasswordForm& form = passwords_vector[0];
   EXPECT_EQ(base::ASCIIToUTF16("user"), form.username_value);
   EXPECT_EQ(base::ASCIIToUTF16("password"), form.password_value);
   EXPECT_FALSE(form.skip_zero_click);
 }
 
-// TODO(crbug.com/626759): flakily failing on Mac.
-#if defined(OS_MACOSX)
-#define MAYBE_AutoSigninOldCredentialAndNavigation \
-    DISABLED_AutoSigninOldCredentialAndNavigation
-#else
-#define MAYBE_AutoSigninOldCredentialAndNavigation \
-    AutoSigninOldCredentialAndNavigation
-#endif
+
 IN_PROC_BROWSER_TEST_F(CredentialManagerBrowserTest,
-                       MAYBE_AutoSigninOldCredentialAndNavigation) {
+                       AutoSigninOldCredentialAndNavigation) {
   // Save credentials with 'skip_zero_click' false.
   scoped_refptr<password_manager::TestPasswordStore> password_store =
       static_cast<password_manager::TestPasswordStore*>(
           PasswordStoreFactory::GetForProfile(
               browser()->profile(), ServiceAccessType::IMPLICIT_ACCESS).get());
   autofill::PasswordForm signin_form;
   signin_form.signon_realm = embedded_test_server()->base_url().spec();
   signin_form.password_value = base::ASCIIToUTF16("password");
   signin_form.username_value = base::ASCIIToUTF16("user");
   signin_form.origin = embedded_test_server()->base_url();
   signin_form.skip_zero_click = false;
   password_store->AddLogin(signin_form);
 
   // 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 to trigger the notification to the client.
+  // 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.
   ASSERT_TRUE(content::ExecuteScript(
       RenderViewHost(),
-      "navigator.credentials.get({password: true})"
-      ".then(cred => window.location = '/password/done.html')"));
+      "setTimeout( function() {"
+        "navigator.credentials.get({password: true})"
+        ".then(cred => window.location = '/password/done.html');"
+      "}, 1000)"));
 
   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.
   EXPECT_FALSE(prompt_observer->IsShowingSavePrompt());
 }
@@ skipping 103 matching lines @@
   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