[Password Manager] Show omnibox icon and anchored prompt once user start typing password

chrome/browser/password_manager/password_manager_test_base.cc

Index: chrome/browser/password_manager/password_manager_test_base.cc
diff --git a/chrome/browser/password_manager/password_manager_test_base.cc b/chrome/browser/password_manager/password_manager_test_base.cc
index b5e3d1239bb012f819ba8b6529d0fbade0cdf267..78f98eca1d2544840f42b557d2fffcebb921598b 100644
--- a/chrome/browser/password_manager/password_manager_test_base.cc
+++ b/chrome/browser/password_manager/password_manager_test_base.cc
@@ -66,11 +66,24 @@ class CustomManagePasswordsUIController : public ManagePasswordsUIController {
 
   void WaitForState(password_manager::ui::State target_state);
 
+  void WaitForFallbackForSaving();
+
+  bool was_prompt_automatically_shown() {
+    return was_prompt_automatically_shown_;
+  }
+
  private:
   // PasswordsClientUIDelegate:
   void OnPasswordSubmitted(
       std::unique_ptr<password_manager::PasswordFormManager> form_manager)
       override;
+  void OnUpdatePasswordSubmitted(
+      std::unique_ptr<password_manager::PasswordFormManager> form_manager)
+      override;
+  void OnShowManualFallbackForSaving(
+      std::unique_ptr<password_manager::PasswordFormManager> form_manager,
+      bool has_generated_password,
+      bool is_update) override;
   bool OnChooseCredentials(
       std::vector<std::unique_ptr<autofill::PasswordForm>> local_credentials,
       const GURL& origin,
@@ -82,12 +95,31 @@ class CustomManagePasswordsUIController : public ManagePasswordsUIController {
       const std::vector<const autofill::PasswordForm*>* federated_matches)
       override;
 
-  // The loop to be stopped when the target state is observed.
+  // Should not be used for manual fallback events.
+  bool CheckIfTargetStateIsObserved(

[vasilii, 2017/08/09 09:32:15]

IsTargetStateObserved

[kolos1, 2017/08/09 09:55:05]

Done.

+      const password_manager::ui::State target_state,
+      const password_manager::ui::State current_state) const;
+
+  void ProcessStateExpectations(
+      const password_manager::ui::State target_state,

[vasilii, 2017/08/09 09:32:14]

I don't see any single place where |target_state| is needed (different from
target_state_.

[kolos1, 2017/08/09 09:55:05]

True. For this function we can always use target_state_.

+      const password_manager::ui::State current_state);
+
+  // Quits |run_loop_| and clears expectations.
+  void QuitRunLoop();
+
+  // The loop to be stopped when the target state or fallback is observed.
   base::RunLoop* run_loop_;
 
   // The state CustomManagePasswordsUIController is currently waiting for.
+  // Manual fallback events don't interrupt waiting.
   password_manager::ui::State target_state_;
 
+  // True iff showing fallback is waited.
+  bool wait_for_fallback_;
+
+  // True iff a prompt was automatically shown.
+  bool was_prompt_automatically_shown_;
+
   DISALLOW_COPY_AND_ASSIGN(CustomManagePasswordsUIController);
 };
 
@@ -95,7 +127,9 @@ CustomManagePasswordsUIController::CustomManagePasswordsUIController(
     content::WebContents* web_contents)
     : ManagePasswordsUIController(web_contents),
       run_loop_(nullptr),
-      target_state_(password_manager::ui::INACTIVE_STATE) {
+      target_state_(password_manager::ui::INACTIVE_STATE),
+      wait_for_fallback_(false),
+      was_prompt_automatically_shown_(false) {
   // Attach CustomManagePasswordsUIController to |web_contents| so the default
   // ManagePasswordsUIController isn't created.
   // Do not silently replace an existing ManagePasswordsUIController because it
@@ -106,32 +140,61 @@ CustomManagePasswordsUIController::CustomManagePasswordsUIController(
 
 void CustomManagePasswordsUIController::WaitForState(
     password_manager::ui::State target_state) {
+  if (CheckIfTargetStateIsObserved(target_state, GetState()))
+    return;
+
   base::RunLoop run_loop;
   target_state_ = target_state;
   run_loop_ = &run_loop;
   run_loop_->Run();
 }
 
+void CustomManagePasswordsUIController::WaitForFallbackForSaving() {
+  if (!was_prompt_automatically_shown_ &&
+      GetState() == password_manager::ui::PENDING_PASSWORD_STATE)
+    return;
+
+  base::RunLoop run_loop;
+  wait_for_fallback_ = true;
+  run_loop_ = &run_loop;
+  run_loop_->Run();
+}
+
 void CustomManagePasswordsUIController::OnPasswordSubmitted(
     std::unique_ptr<password_manager::PasswordFormManager> form_manager) {
-  if (target_state_ == password_manager::ui::PENDING_PASSWORD_STATE) {
-    run_loop_->Quit();
-    run_loop_ = nullptr;
-    target_state_ = password_manager::ui::INACTIVE_STATE;
-  }
+  was_prompt_automatically_shown_ = true;
+  ProcessStateExpectations(target_state_,
+                           password_manager::ui::PENDING_PASSWORD_STATE);
   return ManagePasswordsUIController::OnPasswordSubmitted(
       std::move(form_manager));
 }
 
+void CustomManagePasswordsUIController::OnUpdatePasswordSubmitted(
+    std::unique_ptr<password_manager::PasswordFormManager> form_manager) {
+  was_prompt_automatically_shown_ = true;
+  ProcessStateExpectations(target_state_,
+                           password_manager::ui::PENDING_PASSWORD_UPDATE_STATE);
+  return ManagePasswordsUIController::OnUpdatePasswordSubmitted(
+      std::move(form_manager));
+}
+
+void CustomManagePasswordsUIController::OnShowManualFallbackForSaving(
+    std::unique_ptr<password_manager::PasswordFormManager> form_manager,
+    bool has_generated_password,
+    bool is_update) {
+  if (wait_for_fallback_)
+    QuitRunLoop();
+
+  ManagePasswordsUIController::OnShowManualFallbackForSaving(
+      std::move(form_manager), has_generated_password, is_update);
+}
+
 bool CustomManagePasswordsUIController::OnChooseCredentials(
     std::vector<std::unique_ptr<autofill::PasswordForm>> local_credentials,
     const GURL& origin,
     const ManagePasswordsState::CredentialsCallback& callback) {
-  if (target_state_ == password_manager::ui::CREDENTIAL_REQUEST_STATE) {
-    run_loop_->Quit();
-    run_loop_ = nullptr;
-    target_state_ = password_manager::ui::INACTIVE_STATE;
-  }
+  ProcessStateExpectations(target_state_,
+                           password_manager::ui::CREDENTIAL_REQUEST_STATE);
   return ManagePasswordsUIController::OnChooseCredentials(
       std::move(local_credentials), origin, callback);
 }
@@ -141,15 +204,38 @@ void CustomManagePasswordsUIController::OnPasswordAutofilled(
         password_form_map,
     const GURL& origin,
     const std::vector<const autofill::PasswordForm*>* federated_matches) {
-  if (target_state_ == password_manager::ui::MANAGE_STATE) {
-    run_loop_->Quit();
-    run_loop_ = nullptr;
-    target_state_ = password_manager::ui::INACTIVE_STATE;
-  }
+  ProcessStateExpectations(target_state_, password_manager::ui::MANAGE_STATE);
   return ManagePasswordsUIController::OnPasswordAutofilled(
       password_form_map, origin, federated_matches);
 }
 
+bool CustomManagePasswordsUIController::CheckIfTargetStateIsObserved(
+    const password_manager::ui::State target_state,
+    const password_manager::ui::State current_state) const {
+  // This function should not be used for manual fallback expectations.
+  DCHECK(!wait_for_fallback_);
+
+  bool should_wait_for_automatic_prompt =
+      target_state == password_manager::ui::PENDING_PASSWORD_STATE ||
+      target_state == password_manager::ui::PENDING_PASSWORD_UPDATE_STATE;
+  return target_state == current_state &&
+         (!should_wait_for_automatic_prompt || was_prompt_automatically_shown_);
+}
+
+void CustomManagePasswordsUIController::ProcessStateExpectations(
+    const password_manager::ui::State target_state,
+    const password_manager::ui::State current_state) {
+  if (CheckIfTargetStateIsObserved(target_state, current_state))
+    QuitRunLoop();
+}
+
+void CustomManagePasswordsUIController::QuitRunLoop() {
+  run_loop_->Quit();
+  run_loop_ = nullptr;
+  wait_for_fallback_ = false;
+  target_state_ = password_manager::ui::INACTIVE_STATE;
+}
+
 void AddHSTSHostImpl(
     const scoped_refptr<net::URLRequestContextGetter>& request_context,
     const std::string& host) {
@@ -204,16 +290,32 @@ BubbleObserver::BubbleObserver(content::WebContents* web_contents)
     : passwords_ui_controller_(
           ManagePasswordsUIController::FromWebContents(web_contents)) {}
 
-bool BubbleObserver::IsShowingSavePrompt() const {
+bool BubbleObserver::IsSavePromptAvailable() const {
   return passwords_ui_controller_->GetState() ==
       password_manager::ui::PENDING_PASSWORD_STATE;
 }
 
-bool BubbleObserver::IsShowingUpdatePrompt() const {
+bool BubbleObserver::IsUpdatePromptAvailable() const {
   return passwords_ui_controller_->GetState() ==
       password_manager::ui::PENDING_PASSWORD_UPDATE_STATE;
 }
 
+bool BubbleObserver::IsSavePromptShownAutomatically() const {
+  if (!IsSavePromptAvailable())
+    return false;
+  return static_cast<CustomManagePasswordsUIController*>(
+             passwords_ui_controller_)
+      ->was_prompt_automatically_shown();
+}
+
+bool BubbleObserver::IsUpdatePromptShownAutomatically() const {
+  if (!IsUpdatePromptAvailable())
+    return false;
+  return static_cast<CustomManagePasswordsUIController*>(
+             passwords_ui_controller_)
+      ->was_prompt_automatically_shown();
+}
+
 void BubbleObserver::Dismiss() const  {
   passwords_ui_controller_->OnBubbleHidden();
   ASSERT_EQ(password_manager::ui::INACTIVE_STATE,
@@ -221,46 +323,43 @@ void BubbleObserver::Dismiss() const  {
 }
 
 void BubbleObserver::AcceptSavePrompt() const {
-  ASSERT_TRUE(IsShowingSavePrompt());
+  ASSERT_TRUE(IsSavePromptAvailable());
   passwords_ui_controller_->SavePassword(
       passwords_ui_controller_->GetPendingPassword().username_value);
-  EXPECT_FALSE(IsShowingSavePrompt());
+  EXPECT_FALSE(IsSavePromptAvailable());
 }
 
 void BubbleObserver::AcceptUpdatePrompt(
     const autofill::PasswordForm& form) const {
-  ASSERT_TRUE(IsShowingUpdatePrompt());
+  ASSERT_TRUE(IsUpdatePromptShownAutomatically());

[vasilii, 2017/08/09 09:32:14]

Automatic or not we don't care. Also this check limits the function to be called
on the custom tab only.

[kolos1, 2017/08/09 09:55:05]

oh, of course. Fixed.

   passwords_ui_controller_->UpdatePassword(form);
-  EXPECT_FALSE(IsShowingUpdatePrompt());
+  EXPECT_FALSE(IsUpdatePromptAvailable());
 }
 
 void BubbleObserver::WaitForAccountChooser() const {
-  if (passwords_ui_controller_->GetState() ==
-      password_manager::ui::CREDENTIAL_REQUEST_STATE)
-    return;
   CustomManagePasswordsUIController* controller =
       static_cast<CustomManagePasswordsUIController*>(passwords_ui_controller_);
   controller->WaitForState(password_manager::ui::CREDENTIAL_REQUEST_STATE);
 }
 
 void BubbleObserver::WaitForManagementState() const {
-  if (passwords_ui_controller_->GetState() ==
-      password_manager::ui::MANAGE_STATE)
-    return;
   CustomManagePasswordsUIController* controller =
       static_cast<CustomManagePasswordsUIController*>(passwords_ui_controller_);
   controller->WaitForState(password_manager::ui::MANAGE_STATE);
 }
 
-void BubbleObserver::WaitForSavePrompt() const {
-  if (passwords_ui_controller_->GetState() ==
-      password_manager::ui::PENDING_PASSWORD_STATE)
-    return;
+void BubbleObserver::WaitForAutomaticSavePrompt() const {
   CustomManagePasswordsUIController* controller =
       static_cast<CustomManagePasswordsUIController*>(passwords_ui_controller_);
   controller->WaitForState(password_manager::ui::PENDING_PASSWORD_STATE);
 }
 
+void BubbleObserver::WaitForFallbackForSaving() const {
+  CustomManagePasswordsUIController* controller =
+      static_cast<CustomManagePasswordsUIController*>(passwords_ui_controller_);
+  controller->WaitForFallbackForSaving();
+}
+
 PasswordManagerBrowserTestBase::PasswordManagerBrowserTestBase()
     : https_test_server_(net::EmbeddedTestServer::TYPE_HTTPS),
       web_contents_(nullptr) {}
@@ -500,3 +599,20 @@ void PasswordManagerBrowserTestBase::AddHSTSHost(const std::string& host) {
 
   run_loop.Run();
 }
+
+void PasswordManagerBrowserTestBase::CheckThatCredentialsStored(
+    const base::string16& username,
+    const base::string16& password) {
+  scoped_refptr<password_manager::TestPasswordStore> password_store =
+      static_cast<password_manager::TestPasswordStore*>(
+          PasswordStoreFactory::GetForProfile(
+              browser()->profile(), ServiceAccessType::IMPLICIT_ACCESS)
+              .get());
+  auto& passwords_map = password_store->stored_passwords();
+  ASSERT_EQ(1u, passwords_map.size());
+  auto& passwords_vector = passwords_map.begin()->second;
+  ASSERT_EQ(1u, passwords_vector.size());
+  const autofill::PasswordForm& form = passwords_vector[0];
+  EXPECT_EQ(username, form.username_value);
+  EXPECT_EQ(password, form.password_value);
+}