Password bubble: The bots should run the bubble code.

chrome/browser/password_manager/password_manager_browsertest.cc

 // Copyright 2013 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 <string>
 
 #include "base/command_line.h"
 #include "base/metrics/histogram_samples.h"
 #include "base/metrics/statistics_recorder.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/infobars/infobar_service.h"
+#include "chrome/browser/password_manager/chrome_password_manager_client.h"
 #include "chrome/browser/password_manager/password_store_factory.h"
 #include "chrome/browser/password_manager/test_password_store_service.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/passwords/manage_passwords_ui_controller.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/test_switches.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/autofill/core/browser/autofill_test_utils.h"
 #include "components/infobars/core/confirm_infobar_delegate.h"
 #include "components/infobars/core/infobar.h"
 #include "components/infobars/core/infobar_manager.h"
 #include "components/password_manager/core/browser/test_password_store.h"
@@ skipping 124 matching lines @@
 
  protected:
   content::WebContents* WebContents() {
     return browser()->tab_strip_model()->GetActiveWebContents();
   }
 
   content::RenderViewHost* RenderViewHost() {
     return WebContents()->GetRenderViewHost();
   }
 
+  ManagePasswordsUIController* controller() {
+    return ManagePasswordsUIController::FromWebContents(WebContents());
+  }
+
   // Wrapper around ui_test_utils::NavigateToURL that waits until
   // DidFinishLoad() fires. Normally this function returns after
   // DidStopLoading(), which caused flakiness as the NavigationObserver
   // would sometimes see the DidFinishLoad event from a previous navigation and
   // return immediately.
   void NavigateToFile(const std::string& path) {
     if (!embedded_test_server()->Started())
       ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
 
     ASSERT_FALSE(CommandLine::ForCurrentProcess()->HasSwitch(
@@ skipping 90 matching lines @@
 
   // Fill a form and submit through a <input type="submit"> button. Nothing
   // special.
   NavigationObserver observer(WebContents());
   std::string fill_and_submit =
       "document.getElementById('username_field').value = 'temp';"
       "document.getElementById('password_field').value = 'random';"
       "document.getElementById('input_submit_button').click()";
   ASSERT_TRUE(content::ExecuteScript(RenderViewHost(), fill_and_submit));
   observer.Wait();
-  EXPECT_TRUE(observer.infobar_shown());
+  if (ChromePasswordManagerClient::IsTheHotNewBubbleUIEnabled()) {
+    EXPECT_TRUE(controller()->PasswordPendingUserDecision());
+  } else {
+    EXPECT_TRUE(observer.infobar_shown());
+  }
 }
 
 IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTest,
                        PromptForSubmitWithInPageNavigation) {
   NavigateToFile("/password/password_navigate_before_submit.html");
 
   // Fill a form and submit through a <input type="submit"> button. Nothing
   // special. The form does an in-page navigation before submitting.
   NavigationObserver observer(WebContents());
   std::string fill_and_submit =
       "document.getElementById('username_field').value = 'temp';"
       "document.getElementById('password_field').value = 'random';"
       "document.getElementById('input_submit_button').click()";
   ASSERT_TRUE(content::ExecuteScript(RenderViewHost(), fill_and_submit));
   observer.Wait();
-  EXPECT_TRUE(observer.infobar_shown());
+  if (ChromePasswordManagerClient::IsTheHotNewBubbleUIEnabled()) {
+    EXPECT_TRUE(controller()->PasswordPendingUserDecision());
+  } else {
+    EXPECT_TRUE(observer.infobar_shown());
+  }
 }
 
 IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTest,
                        LoginSuccessWithUnrelatedForm) {
   // Log in, see a form on the landing page. That form is not related to the
   // login form (=has a different action), so we should offer saving the
   // password.
   NavigateToFile("/password/password_form.html");
 
   NavigationObserver observer(WebContents());
   std::string fill_and_submit =
       "document.getElementById('username_unrelated').value = 'temp';"
       "document.getElementById('password_unrelated').value = 'random';"
       "document.getElementById('submit_unrelated').click()";
   ASSERT_TRUE(content::ExecuteScript(RenderViewHost(), fill_and_submit));
   observer.Wait();
-  EXPECT_TRUE(observer.infobar_shown());
+  if (ChromePasswordManagerClient::IsTheHotNewBubbleUIEnabled()) {
+    EXPECT_TRUE(controller()->PasswordPendingUserDecision());
+  } else {
+    EXPECT_TRUE(observer.infobar_shown());
+  }
 }
 
 IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTest, LoginFailed) {
   // Log in, see a form on the landing page. That form is not related to the
   // login form (=has a different action), so we should offer saving the
   // password.
   NavigateToFile("/password/password_form.html");
 
   NavigationObserver observer(WebContents());
   std::string fill_and_submit =
       "document.getElementById('username_failed').value = 'temp';"
       "document.getElementById('password_failed').value = 'random';"
       "document.getElementById('submit_failed').click()";
   ASSERT_TRUE(content::ExecuteScript(RenderViewHost(), fill_and_submit));
   observer.Wait();
-  EXPECT_FALSE(observer.infobar_shown());
+  if (ChromePasswordManagerClient::IsTheHotNewBubbleUIEnabled()) {
+    EXPECT_FALSE(controller()->PasswordPendingUserDecision());
+  } else {
+    EXPECT_FALSE(observer.infobar_shown());
+  }
 }
 
 IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTest, Redirects) {
   NavigateToFile("/password/password_form.html");
 
   // Fill a form and submit through a <input type="submit"> button. The form
   // points to a redirection page.
   NavigationObserver observer(WebContents());
   std::string fill_and_submit =
       "document.getElementById('username_redirect').value = 'temp';"
       "document.getElementById('password_redirect').value = 'random';"
       "document.getElementById('submit_redirect').click()";
   ASSERT_TRUE(content::ExecuteScript(RenderViewHost(), fill_and_submit));
   observer.disable_should_automatically_accept_infobar();
   observer.Wait();
-  EXPECT_TRUE(observer.infobar_shown());
+  if (ChromePasswordManagerClient::IsTheHotNewBubbleUIEnabled()) {
+    EXPECT_TRUE(controller()->PasswordPendingUserDecision());
+  } else {
+    EXPECT_TRUE(observer.infobar_shown());
+  }
 
   // The redirection page now redirects via Javascript. We check that the
   // infobar stays.
   ASSERT_TRUE(content::ExecuteScript(RenderViewHost(),
                                      "window.location.href = 'done.html';"));
   observer.Wait();
-  EXPECT_FALSE(observer.infobar_removed());
+  if (ChromePasswordManagerClient::IsTheHotNewBubbleUIEnabled()) {
+    EXPECT_TRUE(controller()->PasswordPendingUserDecision());
+  } else {
+    EXPECT_FALSE(observer.infobar_removed());
+  }
 }
 
 IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTest,
                        PromptForSubmitUsingJavaScript) {
   NavigateToFile("/password/password_form.html");
 
   // Fill a form and submit using <button> that calls submit() on the form.
   // This should work regardless of the type of element, as long as submit() is
   // called.
   NavigationObserver observer(WebContents());
   std::string fill_and_submit =
       "document.getElementById('username_field').value = 'temp';"
       "document.getElementById('password_field').value = 'random';"
       "document.getElementById('submit_button').click()";
   ASSERT_TRUE(content::ExecuteScript(RenderViewHost(), fill_and_submit));
   observer.Wait();
-  EXPECT_TRUE(observer.infobar_shown());
+  if (ChromePasswordManagerClient::IsTheHotNewBubbleUIEnabled()) {
+    EXPECT_TRUE(controller()->PasswordPendingUserDecision());
+  } else {
+    EXPECT_TRUE(observer.infobar_shown());
+  }
 }
 
 // Flaky: crbug.com/301547, observed on win and mac. Probably happens on all
 // platforms.
 IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTest,
                        DISABLED_PromptForDynamicForm) {
   NavigateToFile("/password/dynamic_password_form.html");
 
   // Fill the dynamic password form and submit.
   NavigationObserver observer(WebContents());
   std::string fill_and_submit =
       "document.getElementById('create_form_button').click();"
       "window.setTimeout(function() {"
       "  document.dynamic_form.username.value = 'tempro';"
       "  document.dynamic_form.password.value = 'random';"
       "  document.dynamic_form.submit();"
       "}, 0)";
   ASSERT_TRUE(content::ExecuteScript(RenderViewHost(), fill_and_submit));
   observer.Wait();
-  EXPECT_TRUE(observer.infobar_shown());
+  if (ChromePasswordManagerClient::IsTheHotNewBubbleUIEnabled()) {
+    EXPECT_TRUE(controller()->PasswordPendingUserDecision());
+  } else {
+    EXPECT_TRUE(observer.infobar_shown());
+  }
 }
 
 IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTest, NoPromptForNavigation) {
   NavigateToFile("/password/password_form.html");
 
   // Don't fill the password form, just navigate away. Shouldn't prompt.
   NavigationObserver observer(WebContents());
   ASSERT_TRUE(content::ExecuteScript(RenderViewHost(),
                                      "window.location.href = 'done.html';"));
   observer.Wait();
-  EXPECT_FALSE(observer.infobar_shown());
+  if (ChromePasswordManagerClient::IsTheHotNewBubbleUIEnabled()) {
+    EXPECT_FALSE(controller()->PasswordPendingUserDecision());
+  } else {
+    EXPECT_FALSE(observer.infobar_shown());
+  }
 }
 
 IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTest,
                        NoPromptForSubFrameNavigation) {
   NavigateToFile("/password/multi_frames.html");
 
   // If you are filling out a password form in one frame and a different frame
   // navigates, this should not trigger the infobar.
   NavigationObserver observer(WebContents());
   observer.SetPathToWaitFor("/password/done.html");
   std::string fill =
       "var first_frame = document.getElementById('first_frame');"
       "var frame_doc = first_frame.contentDocument;"
       "frame_doc.getElementById('username_field').value = 'temp';"
       "frame_doc.getElementById('password_field').value = 'random';";
   std::string navigate_frame =
       "var second_iframe = document.getElementById('second_frame');"
       "second_iframe.contentWindow.location.href = 'done.html';";
 
   ASSERT_TRUE(content::ExecuteScript(RenderViewHost(), fill));
   ASSERT_TRUE(content::ExecuteScript(RenderViewHost(), navigate_frame));
   observer.Wait();
-  EXPECT_FALSE(observer.infobar_shown());
+  if (ChromePasswordManagerClient::IsTheHotNewBubbleUIEnabled()) {
+    EXPECT_FALSE(controller()->PasswordPendingUserDecision());
+  } else {
+    EXPECT_FALSE(observer.infobar_shown());
+  }
 }
 
 IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTest,
                        PromptAfterSubmitWithSubFrameNavigation) {
   NavigateToFile("/password/multi_frames.html");
 
   // Make sure that we prompt to save password even if a sub-frame navigation
   // happens first.
   NavigationObserver observer(WebContents());
   observer.SetPathToWaitFor("/password/done.html");
   std::string navigate_frame =
       "var second_iframe = document.getElementById('second_frame');"
       "second_iframe.contentWindow.location.href = 'other.html';";
   std::string fill_and_submit =
       "var first_frame = document.getElementById('first_frame');"
       "var frame_doc = first_frame.contentDocument;"
       "frame_doc.getElementById('username_field').value = 'temp';"
       "frame_doc.getElementById('password_field').value = 'random';"
       "frame_doc.getElementById('input_submit_button').click();";
 
   ASSERT_TRUE(content::ExecuteScript(RenderViewHost(), navigate_frame));
   ASSERT_TRUE(content::ExecuteScript(RenderViewHost(), fill_and_submit));
   observer.Wait();
-  EXPECT_TRUE(observer.infobar_shown());
+  if (ChromePasswordManagerClient::IsTheHotNewBubbleUIEnabled()) {
+    EXPECT_TRUE(controller()->PasswordPendingUserDecision());
+  } else {
+    EXPECT_TRUE(observer.infobar_shown());
+  }
 }
 
 IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTest,
                        PromptForXHRSubmit) {
 #if defined(OS_WIN) && defined(USE_ASH)
   // Disable this test in Metro+Ash for now (http://crbug.com/262796).
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
     return;
 #endif
   NavigateToFile("/password/password_xhr_submit.html");
 
   // Verify that we show the save password prompt if a form returns false
   // in its onsubmit handler but instead logs in/navigates via XHR.
   // Note that calling 'submit()' on a form with javascript doesn't call
   // the onsubmit handler, so we click the submit button instead.
   NavigationObserver observer(WebContents());
   std::string fill_and_submit =
       "document.getElementById('username_field').value = 'temp';"
       "document.getElementById('password_field').value = 'random';"
       "document.getElementById('submit_button').click()";
   ASSERT_TRUE(content::ExecuteScript(RenderViewHost(), fill_and_submit));
   observer.Wait();
-  EXPECT_TRUE(observer.infobar_shown());
+  if (ChromePasswordManagerClient::IsTheHotNewBubbleUIEnabled()) {
+    EXPECT_TRUE(controller()->PasswordPendingUserDecision());
+  } else {
+    EXPECT_TRUE(observer.infobar_shown());
+  }
 }
 
 IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTest,
                        PromptForXHRWithoutOnSubmit) {
   NavigateToFile("/password/password_xhr_submit.html");
 
   // Verify that if XHR navigation occurs and the form is properly filled out,
   // we try and save the password even though onsubmit hasn't been called.
   NavigationObserver observer(WebContents());
   std::string fill_and_navigate =
       "document.getElementById('username_field').value = 'temp';"
       "document.getElementById('password_field').value = 'random';"
       "send_xhr()";
   ASSERT_TRUE(content::ExecuteScript(RenderViewHost(), fill_and_navigate));
   observer.Wait();
-  EXPECT_TRUE(observer.infobar_shown());
+  if (ChromePasswordManagerClient::IsTheHotNewBubbleUIEnabled()) {
+    EXPECT_TRUE(controller()->PasswordPendingUserDecision());
+  } else {
+    EXPECT_TRUE(observer.infobar_shown());
+  }
 }
 
 IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTest,
                        NoPromptIfLinkClicked) {
   NavigateToFile("/password/password_form.html");
 
   // Verify that if the user takes a direct action to leave the page, we don't
   // prompt to save the password even if the form is already filled out.
   NavigationObserver observer(WebContents());
   std::string fill_and_click_link =
       "document.getElementById('username_field').value = 'temp';"
       "document.getElementById('password_field').value = 'random';"
       "document.getElementById('link').click();";
   ASSERT_TRUE(content::ExecuteScript(RenderViewHost(), fill_and_click_link));
   observer.Wait();
-  EXPECT_FALSE(observer.infobar_shown());
+  if (ChromePasswordManagerClient::IsTheHotNewBubbleUIEnabled()) {
+    EXPECT_FALSE(controller()->PasswordPendingUserDecision());
+  } else {
+    EXPECT_FALSE(observer.infobar_shown());
+  }
 }
 
 // TODO(jam): http://crbug.com/350550
 #if !defined(OS_WIN)
 IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTest,
                        VerifyPasswordGenerationUpload) {
   // Prevent Autofill requests from actually going over the wire.
   net::TestURLFetcherFactory factory;
   // Disable Autofill requesting access to AddressBook data. This causes
   // the test to hang on Mac.
   autofill::test::DisableSystemServices(browser()->profile()->GetPrefs());
 
   // Visit a signup form.
   NavigateToFile("/password/signup_form.html");
 
   // Enter a password and save it.
   NavigationObserver first_observer(WebContents());
   std::string fill_and_submit =
       "document.getElementById('other_info').value = 'stuff';"
       "document.getElementById('username_field').value = 'my_username';"
       "document.getElementById('password_field').value = 'password';"
       "document.getElementById('input_submit_button').click()";
   ASSERT_TRUE(content::ExecuteScript(RenderViewHost(), fill_and_submit));
 
   first_observer.Wait();
-  ASSERT_TRUE(first_observer.infobar_shown());
+  if (ChromePasswordManagerClient::IsTheHotNewBubbleUIEnabled()) {
+    ASSERT_TRUE(controller()->PasswordPendingUserDecision());
+    controller()->SavePassword();
+  } else {
+    ASSERT_TRUE(first_observer.infobar_shown());
+  }
 
   // Now navigate to a login form that has similar HTML markup.
   NavigateToFile("/password/password_form.html");
 
   // Simulate a user click to force an autofill of the form's DOM value, not
   // just the suggested value.
   content::SimulateMouseClick(
       WebContents(), 0, blink::WebMouseEvent::ButtonLeft);
 
   // The form should be filled with the previously submitted username.
   std::string get_username =
       "window.domAutomationController.send("
       "document.getElementById('username_field').value);";
   std::string actual_username;
   ASSERT_TRUE(content::ExecuteScriptAndExtractString(RenderViewHost(),
                                                      get_username,
                                                      &actual_username));
   ASSERT_EQ("my_username", actual_username);
 
   // Submit the form and verify that there is no infobar (as the password
   // has already been saved).
   NavigationObserver second_observer(WebContents());
   std::string submit_form =
       "document.getElementById('input_submit_button').click()";
   ASSERT_TRUE(content::ExecuteScript(RenderViewHost(), submit_form));
   second_observer.Wait();
-  EXPECT_FALSE(second_observer.infobar_shown());
+  if (ChromePasswordManagerClient::IsTheHotNewBubbleUIEnabled()) {
+    EXPECT_FALSE(controller()->PasswordPendingUserDecision());
+  } else {
+    EXPECT_FALSE(second_observer.infobar_shown());
+  }
 
   // Verify that we sent a ping to Autofill saying that the original form
   // was likely an account creation form since it has more than 2 text input
   // fields and was used for the first time on a different form.
   base::HistogramBase* upload_histogram =
       base::StatisticsRecorder::FindHistogram(
           "PasswordGeneration.UploadStarted");
   ASSERT_TRUE(upload_histogram);
   scoped_ptr<base::HistogramSamples> snapshot =
       upload_histogram->SnapshotSamples();
@@ skipping 11 matching lines @@
   NavigationObserver observer(WebContents());
   std::string fill_and_submit =
       "var iframe = document.getElementById('test_iframe');"
       "var iframe_doc = iframe.contentDocument;"
       "iframe_doc.getElementById('username_field').value = 'temp';"
       "iframe_doc.getElementById('password_field').value = 'random';"
       "iframe_doc.getElementById('submit_button').click()";
 
   ASSERT_TRUE(content::ExecuteScript(RenderViewHost(), fill_and_submit));
   observer.Wait();
-  EXPECT_TRUE(observer.infobar_shown());
+  if (ChromePasswordManagerClient::IsTheHotNewBubbleUIEnabled()) {
+    EXPECT_TRUE(controller()->PasswordPendingUserDecision());
+  } else {
+    EXPECT_TRUE(observer.infobar_shown());
+  }
 }
 
 IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTest,
                        PromptForInputElementWithoutName) {
   // Check that the prompt is shown for forms where input elements lack the
   // "name" attribute but the "id" is present.
   NavigateToFile("/password/password_form.html");
 
   NavigationObserver observer(WebContents());
   std::string fill_and_submit =
       "document.getElementById('username_field_no_name').value = 'temp';"
       "document.getElementById('password_field_no_name').value = 'random';"
       "document.getElementById('input_submit_button_no_name').click()";
   ASSERT_TRUE(content::ExecuteScript(RenderViewHost(), fill_and_submit));
   observer.Wait();
-  EXPECT_TRUE(observer.infobar_shown());
+  if (ChromePasswordManagerClient::IsTheHotNewBubbleUIEnabled()) {
+    EXPECT_TRUE(controller()->PasswordPendingUserDecision());
+  } else {
+    EXPECT_TRUE(observer.infobar_shown());
+  }
 }
 
 IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTest,
                        PromptForInputElementWithoutId) {
   // Check that the prompt is shown for forms where input elements lack the
   // "id" attribute but the "name" attribute is present.
   NavigateToFile("/password/password_form.html");
 
   NavigationObserver observer(WebContents());
   std::string fill_and_submit =
       "document.getElementsByName('username_field_no_id')[0].value = 'temp';"
       "document.getElementsByName('password_field_no_id')[0].value = 'random';"
       "document.getElementsByName('input_submit_button_no_id')[0].click()";
   ASSERT_TRUE(content::ExecuteScript(RenderViewHost(), fill_and_submit));
   observer.Wait();
-  EXPECT_TRUE(observer.infobar_shown());
+  if (ChromePasswordManagerClient::IsTheHotNewBubbleUIEnabled()) {
+    EXPECT_TRUE(controller()->PasswordPendingUserDecision());
+  } else {
+    EXPECT_TRUE(observer.infobar_shown());
+  }
 }
 
 IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTest,
                        NoPromptForInputElementWithoutIdAndName) {
   // Check that no prompt is shown for forms where the input fields lack both
   // the "id" and the "name" attributes.
   NavigateToFile("/password/password_form.html");
 
   NavigationObserver observer(WebContents());
   std::string fill_and_submit =
       "var form = document.getElementById('testform_elements_no_id_no_name');"
       "var username = form.children[0];"
       "username.value = 'temp';"
       "var password = form.children[1];"
       "password.value = 'random';"
       "form.children[2].click()";  // form.children[2] is the submit button.
   ASSERT_TRUE(content::ExecuteScript(RenderViewHost(), fill_and_submit));
   observer.Wait();
-  EXPECT_FALSE(observer.infobar_shown());
+  if (ChromePasswordManagerClient::IsTheHotNewBubbleUIEnabled()) {
+    EXPECT_FALSE(controller()->PasswordPendingUserDecision());
+  } else {
+    EXPECT_FALSE(observer.infobar_shown());
+  }
 }
 
 IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTest, DeleteFrameBeforeSubmit) {
   NavigateToFile("/password/multi_frames.html");
 
   NavigationObserver observer(WebContents());
   // Make sure we save some password info from an iframe and then destroy it.
   std::string save_and_remove =
       "var first_frame = document.getElementById('first_frame');"
       "var frame_doc = first_frame.contentDocument;"
@@ skipping 27 matching lines @@
   browser()->tab_strip_model()->ActivateTabAt(0, false);
 
   // Fill in the credentials, and make sure they are saved.
   NavigationObserver form_submit_observer(WebContents());
   std::string fill_and_submit =
       "document.getElementById('username_field').value = 'temp';"
       "document.getElementById('password_field').value = 'random';"
       "document.getElementById('input_submit_button').click();";
   ASSERT_TRUE(content::ExecuteScript(RenderViewHost(), fill_and_submit));
   form_submit_observer.Wait();
-  EXPECT_TRUE(form_submit_observer.infobar_shown());
+  if (ChromePasswordManagerClient::IsTheHotNewBubbleUIEnabled()) {
+    EXPECT_TRUE(controller()->PasswordPendingUserDecision());
+    controller()->SavePassword();
+  } else {
+    EXPECT_TRUE(form_submit_observer.infobar_shown());
+  }
 
   // Reload the original page to have the saved credentials autofilled.
   NavigationObserver reload_observer(WebContents());
   NavigateToFile("/password/form_and_link.html");
   reload_observer.Wait();
 
   // Wait until the username is filled, to make sure autofill kicked in.
   WaitForElementValue("username_field", "temp");
   // Now check that the password is not accessible yet.
   CheckElementValue("password_field", "");
@@ skipping 17 matching lines @@
   NavigateToFile("/password/form_and_link.html");
 
   // Fill in the credentials, and make sure they are saved.
   NavigationObserver form_submit_observer(WebContents());
   std::string fill_and_submit =
       "document.getElementById('username_field').value = 'temp';"
       "document.getElementById('password_field').value = 'random_secret';"
       "document.getElementById('input_submit_button').click();";
   ASSERT_TRUE(content::ExecuteScript(RenderViewHost(), fill_and_submit));
   form_submit_observer.Wait();
-  EXPECT_TRUE(form_submit_observer.infobar_shown());
+  if (ChromePasswordManagerClient::IsTheHotNewBubbleUIEnabled()) {
+    EXPECT_TRUE(controller()->PasswordPendingUserDecision());
+    controller()->SavePassword();
+  } else {
+    EXPECT_TRUE(form_submit_observer.infobar_shown());
+  }
 
   // Reload the original page to have the saved credentials autofilled.
   NavigationObserver reload_observer(WebContents());
   NavigateToFile("/password/form_and_link.html");
   reload_observer.Wait();
 
   NavigationObserver submit_observer(WebContents());
   // Submit the form via a tap on the submit button. The button is placed at 0,
   // 100, and has height 300 and width 700.
   content::SimulateTapAt(WebContents(), gfx::Point(350, 250));
   submit_observer.Wait();
   std::string query = WebContents()->GetURL().query();
   EXPECT_NE(std::string::npos, query.find("random_secret")) << query;
 }
 #endif
 
 // Test fix for crbug.com/338650.
 IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTest,
                        DontPromptForPasswordFormWithDefaultValue) {
   NavigateToFile("/password/password_form_with_default_value.html");
 
   // Don't prompt if we navigate away even if there is a password value since
   // it's not coming from the user.
   NavigationObserver observer(WebContents());
   NavigateToFile("/password/done.html");
   observer.Wait();
-  EXPECT_FALSE(observer.infobar_shown());
+  if (ChromePasswordManagerClient::IsTheHotNewBubbleUIEnabled()) {
+    EXPECT_FALSE(controller()->PasswordPendingUserDecision());
+  } else {
+    EXPECT_FALSE(observer.infobar_shown());
+  }
 }
 
 IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTest,
                        PromptWhenEnableAutomaticPasswordSavingSwitchIsNotSet) {
   NavigateToFile("/password/password_form.html");
 
   // Fill a form and submit through a <input type="submit"> button.
   NavigationObserver observer(WebContents());
   std::string fill_and_submit =
       "document.getElementById('username_field').value = 'temp';"
       "document.getElementById('password_field').value = 'random';"
       "document.getElementById('input_submit_button').click()";
   ASSERT_TRUE(content::ExecuteScript(RenderViewHost(), fill_and_submit));
   observer.Wait();
-  EXPECT_TRUE(observer.infobar_shown());
+  if (ChromePasswordManagerClient::IsTheHotNewBubbleUIEnabled()) {
+    EXPECT_TRUE(controller()->PasswordPendingUserDecision());
+  } else {
+    EXPECT_TRUE(observer.infobar_shown());
+  }
 }
 
 IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTest,
                        DontPromptWhenEnableAutomaticPasswordSavingSwitchIsSet) {
   password_manager::TestPasswordStore* password_store =
       static_cast<password_manager::TestPasswordStore*>(
           PasswordStoreFactory::GetForProfile(browser()->profile(),
                                               Profile::IMPLICIT_ACCESS).get());
 
   EXPECT_TRUE(password_store->IsEmpty());
 
   NavigateToFile("/password/password_form.html");
 
   // Add the enable-automatic-password-saving switch.
   CommandLine::ForCurrentProcess()->AppendSwitch(
       password_manager::switches::kEnableAutomaticPasswordSaving);
 
   // Fill a form and submit through a <input type="submit"> button.
   NavigationObserver observer(WebContents());
   // Make sure that the only passwords saved are the auto-saved ones.
   observer.disable_should_automatically_accept_infobar();
   std::string fill_and_submit =
       "document.getElementById('username_field').value = 'temp';"
       "document.getElementById('password_field').value = 'random';"
       "document.getElementById('input_submit_button').click()";
   ASSERT_TRUE(content::ExecuteScript(RenderViewHost(), fill_and_submit));
   observer.Wait();
   if (chrome::VersionInfo::GetChannel() ==
       chrome::VersionInfo::CHANNEL_UNKNOWN) {
-    EXPECT_FALSE(observer.infobar_shown());
+    if (ChromePasswordManagerClient::IsTheHotNewBubbleUIEnabled()) {
+      EXPECT_FALSE(controller()->PasswordPendingUserDecision());
+    } else {
+      EXPECT_FALSE(observer.infobar_shown());
+    }
     EXPECT_FALSE(password_store->IsEmpty());
   } else {
-    EXPECT_TRUE(observer.infobar_shown());
+    if (ChromePasswordManagerClient::IsTheHotNewBubbleUIEnabled()) {
+      EXPECT_TRUE(controller()->PasswordPendingUserDecision());
+    } else {
+      EXPECT_TRUE(observer.infobar_shown());
+    }
     EXPECT_TRUE(password_store->IsEmpty());
   }
 }
 
 // Test fix for crbug.com/368690.
 IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTest, NoPromptWhenReloading) {
   NavigateToFile("/password/password_form.html");
 
   std::string fill =
       "document.getElementById('username_redirect').value = 'temp';"
       "document.getElementById('password_redirect').value = 'random';";
   ASSERT_TRUE(content::ExecuteScript(RenderViewHost(), fill));
 
   NavigationObserver observer(WebContents());
   GURL url = embedded_test_server()->GetURL("/password/password_form.html");
   chrome::NavigateParams params(browser(), url,
                                 content::PAGE_TRANSITION_RELOAD);
   ui_test_utils::NavigateToURL(&params);
   observer.Wait();
-  EXPECT_FALSE(observer.infobar_shown());
+  if (ChromePasswordManagerClient::IsTheHotNewBubbleUIEnabled()) {
+    EXPECT_FALSE(controller()->PasswordPendingUserDecision());
+  } else {
+    EXPECT_FALSE(observer.infobar_shown());
+  }
 }