Hide PSL matches in the password bubble after the account chooser.

chrome/browser/ui/passwords/manage_passwords_ui_controller.cc

 // Copyright 2014 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 "chrome/browser/ui/passwords/manage_passwords_ui_controller.h"
 
 #include <utility>
 
 #include "base/auto_reset.h"
 #include "chrome/app/chrome_command_ids.h"
@@ skipping 81 matching lines @@
   passwords_data_.OnUpdatePassword(std::move(form_manager));
   bubble_status_ = SHOULD_POP_UP;
   UpdateBubbleAndIconVisibility();
 }
 
 bool ManagePasswordsUIController::OnChooseCredentials(
     std::vector<std::unique_ptr<autofill::PasswordForm>> local_credentials,
     std::vector<std::unique_ptr<autofill::PasswordForm>> federated_credentials,
     const GURL& origin,
     const ManagePasswordsState::CredentialsCallback& callback) {
-  DCHECK(!local_credentials.empty() || !federated_credentials.empty());
+  DCHECK(!local_credentials.empty());
   if (!HasBrowserWindow())
     return false;
-  PasswordDialogController::FormsVector locals =
-      CopyFormVector(local_credentials);
+  // If |local_credentials| contains PSL matches they shouldn't be propagated to
+  // the state because PSL matches aren't saved for current page. This logic is
+  // implemented here because Android uses ManagePasswordsState as a data source
+  // for account chooser.
+  PasswordDialogController::FormsVector locals;
+  if (!local_credentials[0]->is_public_suffix_match)
+    locals = CopyFormVector(local_credentials);
   PasswordDialogController::FormsVector federations =
       CopyFormVector(federated_credentials);
   passwords_data_.OnRequestCredentials(
-      std::move(local_credentials), std::move(federated_credentials), origin);
+      std::move(locals), std::move(federations), origin);
   passwords_data_.set_credentials_callback(callback);
   dialog_controller_.reset(new PasswordDialogControllerImpl(
       Profile::FromBrowserContext(web_contents()->GetBrowserContext()),
       this));
   dialog_controller_->ShowAccountChooser(
       CreateAccountChooser(dialog_controller_.get()),
-      std::move(locals), std::move(federations));
+      std::move(local_credentials), std::move(federated_credentials));
   UpdateBubbleAndIconVisibility();
   return true;
 }
 
 void ManagePasswordsUIController::OnAutoSignin(
     std::vector<std::unique_ptr<autofill::PasswordForm>> local_forms,
     const GURL& origin) {
   DCHECK(!local_forms.empty());
   DestroyAccountChooser();
   passwords_data_.OnAutoSignin(std::move(local_forms), origin);
@@ skipping 329 matching lines @@
     passwords_data_.TransitionToState(password_manager::ui::MANAGE_STATE);
   }
 }
 
 void ManagePasswordsUIController::WebContentsDestroyed() {
   password_manager::PasswordStore* password_store =
       GetPasswordStore(web_contents());
   if (password_store)
     password_store->RemoveObserver(this);
 }