Move to account store bubble: Hook up the "No, thanks" button

If the user presses the "No, thanks" button, Chrome shouldn't ask to
move this particular password again. That requires hooking up the button
to PasswordFormManager::BlockMovingCredentialsToAccountStore() which
this CL does.

Bug: 1060128
Change-Id: I706bffd07d9883db1544363524628d24f56e4272
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2263214Reviewed-by: Mohamed Amir Yosef <mamir@chromium.org>
Commit-Queue: Marc Treib <treib@chromium.org>
Cr-Commit-Position: refs/heads/master@{#781807}

chrome/browser/ui/passwords/bubble_controllers/move_to_account_store_bubble_controller.cc

@@ -47,6 +47,10 @@ void MoveToAccountStoreBubbleController::AcceptMove() {
   return delegate_->AuthenticateUserForAccountStoreOptInAndMovePassword();
 }
 
+void MoveToAccountStoreBubbleController::RejectMove() {
+  return delegate_->BlockMovingPasswordToAccountStore();
+}
+
 gfx::Image MoveToAccountStoreBubbleController::GetProfileIcon() {
   if (!GetProfile())
     return gfx::Image();

chrome/browser/ui/passwords/bubble_controllers/move_to_account_store_bubble_controller.h

@@ -21,6 +21,9 @@ class MoveToAccountStoreBubbleController : public PasswordBubbleControllerBase {
   // Called by the view when the user clicks the confirmation button.
   void AcceptMove();
 
+  // Called by the view when the user clicks the "No, thanks" button.
+  void RejectMove();
+
   // Returns either a large site icon or a fallback icon.
   gfx::Image GetProfileIcon();
 

chrome/browser/ui/passwords/bubble_controllers/move_to_account_store_bubble_controller_unittest.cc

@@ -82,6 +82,11 @@ TEST_F(MoveToAccountStoreBubbleControllerTest, AuthenticateMoveIfOptedOut) {
   controller()->AcceptMove();
 }
 
+TEST_F(MoveToAccountStoreBubbleControllerTest, RejectMove) {
+  EXPECT_CALL(*delegate(), BlockMovingPasswordToAccountStore);
+  controller()->RejectMove();
+}
+
 TEST_F(MoveToAccountStoreBubbleControllerTest, ProvidesTitle) {
   PasswordBubbleControllerBase* controller_ptr = controller();
   EXPECT_EQ(controller_ptr->GetTitle(),

chrome/browser/ui/passwords/manage_passwords_ui_controller.cc

@@ -545,6 +545,16 @@ void ManagePasswordsUIController::MovePasswordToAccountStore() {
   UpdateBubbleAndIconVisibility();
 }
 
+void ManagePasswordsUIController::BlockMovingPasswordToAccountStore() {
+  DCHECK_EQ(GetState(),
+            password_manager::ui::CAN_MOVE_PASSWORD_TO_ACCOUNT_STATE)
+      << GetState();
+  passwords_data_.form_manager()->BlockMovingCredentialsToAccountStore();
+  ClearPopUpFlagForBubble();
+  passwords_data_.TransitionToState(password_manager::ui::MANAGE_STATE);
+  UpdateBubbleAndIconVisibility();
+}
+
 void ManagePasswordsUIController::ChooseCredential(
     const autofill::PasswordForm& form,
     password_manager::CredentialType credential_type) {

chrome/browser/ui/passwords/manage_passwords_ui_controller.h

@@ -146,6 +146,7 @@ class ManagePasswordsUIController
   void SaveUnsyncedCredentialsInProfileStore() override;
   void DiscardUnsyncedCredentials() override;
   void MovePasswordToAccountStore() override;
+  void BlockMovingPasswordToAccountStore() override;
   void ChooseCredential(
       const autofill::PasswordForm& form,
       password_manager::CredentialType credential_type) override;

chrome/browser/ui/passwords/passwords_model_delegate.h

@@ -121,6 +121,10 @@ class PasswordsModelDelegate {
   // used credential to their account store.
   virtual void MovePasswordToAccountStore() = 0;
 
+  // Called from the dialog controller when a user rejects moving the recently
+  // used credential to their account store.
+  virtual void BlockMovingPasswordToAccountStore() = 0;
+
   // Called from the dialog controller when the user chooses a credential.
   // Controller can be destroyed inside the method.
   virtual void ChooseCredential(

chrome/browser/ui/passwords/passwords_model_delegate_mock.h

@@ -51,6 +51,7 @@ class PasswordsModelDelegateMock
   MOCK_METHOD0(SaveUnsyncedCredentialsInProfileStore, void());
   MOCK_METHOD0(DiscardUnsyncedCredentials, void());
   MOCK_METHOD0(MovePasswordToAccountStore, void());
+  MOCK_METHOD0(BlockMovingPasswordToAccountStore, void());
   MOCK_METHOD2(ChooseCredential,
                void(const autofill::PasswordForm&,
                     password_manager::CredentialType));

chrome/browser/ui/views/passwords/move_to_account_store_bubble_view.cc

@@ -88,6 +88,9 @@ MoveToAccountStoreBubbleView::MoveToAccountStoreBubbleView(
   SetAcceptCallback(
       base::BindOnce(&MoveToAccountStoreBubbleController::AcceptMove,
                      base::Unretained(&controller_)));
+  SetCancelCallback(
+      base::BindOnce(&MoveToAccountStoreBubbleController::RejectMove,
+                     base::Unretained(&controller_)));
 }
 
 MoveToAccountStoreBubbleView::~MoveToAccountStoreBubbleView() = default;