Fix flaky CredentialManagerBrowserTest.AccountChooserWithOldCredentialAndNavigation and StoreSavesP…

chrome/browser/password_manager/credential_manager_browsertest.cc

Index: chrome/browser/password_manager/credential_manager_browsertest.cc
diff --git a/chrome/browser/password_manager/credential_manager_browsertest.cc b/chrome/browser/password_manager/credential_manager_browsertest.cc
index f88f028417c153d4679029f6e0c29f71349795b5..07f77a8be4186270f2b18e8b0981df374ab3f9e5 100644
--- a/chrome/browser/password_manager/credential_manager_browsertest.cc
+++ b/chrome/browser/password_manager/credential_manager_browsertest.cc
@@ -74,10 +74,8 @@ IN_PROC_BROWSER_TEST_F(CredentialManagerBrowserTest,
       RenderViewHost(),
       "navigator.credentials.get({password: true})"
       ".then(cred => window.location = '/password/done.html')"));
-  WaitForPasswordStore();
-  ASSERT_EQ(
-      password_manager::ui::CREDENTIAL_REQUEST_STATE,
-      PasswordsModelDelegateFromWebContents(WebContents())->GetState());
+  // Mojo calls from the renderer are asynchronous.
+  BubbleObserver(WebContents()).WaitForAccountChooser();
   PasswordsModelDelegateFromWebContents(WebContents())->ChooseCredential(
       signin_form,
       password_manager::CredentialType::CREDENTIAL_TYPE_PASSWORD);
@@ -134,9 +132,8 @@ IN_PROC_BROWSER_TEST_F(CredentialManagerBrowserTest,
                              ".then(cred => "
                              "window.location = '/password/done.html'))"));
 
-  WaitForPasswordStore();
-  ASSERT_EQ(password_manager::ui::CREDENTIAL_REQUEST_STATE,
-            PasswordsModelDelegateFromWebContents(WebContents())->GetState());
+  // Mojo calls from the renderer are asynchronous.
+  BubbleObserver(WebContents()).WaitForAccountChooser();
   PasswordsModelDelegateFromWebContents(WebContents())
       ->ChooseCredential(
           signin_form,