[b4P] Remove comma from "No, thanks" in move bubble and dialog

Bug: 1062344
Change-Id: I45a3ef9f01e234c342bd442ff9b38d802db5a9fa
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2362756Reviewed-by: Marc Treib <treib@chromium.org>
Commit-Queue: Victor Vianna <victorvianna@google.com>
Cr-Commit-Position: refs/heads/master@{#799592}

chrome/app/generated_resources.grd

@@ -5995,9 +5995,12 @@ the Bookmarks menu.">
         <message name="IDS_PASSWORD_MANAGER_SAVE_BUTTON" desc="Save button text for password manager">
           Save
         </message>
-        <message name="IDS_PASSWORD_MANAGER_MOVE_BUTTON" desc="Move button text for password manager">
+        <message name="IDS_PASSWORD_MANAGER_MOVE_BUBBLE_OK_BUTTON" desc="Text for the ok button in the password manager move bubble.">
           Move
         </message>
+        <message name="IDS_PASSWORD_MANAGER_MOVE_BUBBLE_CANCEL_BUTTON" desc="Text for the cancel button in the password manager move bubble.">
+          No thanks
+        </message>
         <if expr="use_titlecase">
           <message name="IDS_PASSWORD_MANAGER_UPDATE_BUTTON" desc="In Title Case: Update button text for password manager">
             Update Password

chrome/app/generated_resources_grd/IDS_PASSWORD_MANAGER_MOVE_BUBBLE_CANCEL_BUTTON.png.sha1

+ebcf220382bb6b59a7d185e0bdb17a9f9898a6c4
\ No newline at end of file

chrome/app/generated_resources_grd/IDS_PASSWORD_MANAGER_MOVE_BUBBLE_OK_BUTTON.png.sha1

+ebcf220382bb6b59a7d185e0bdb17a9f9898a6c4
\ No newline at end of file

chrome/app/settings_strings.grdp

@@ -530,7 +530,7 @@
     Move
   </message>
   <message name="IDS_SETTINGS_PASSWORD_MOVE_TO_ACCOUNT_DIALOG_CANCEL_BUTTON_TEXT" desc="Text for the button that cancels the action of moving a password to the user Google Account.">
-    No, thanks
+    No thanks
   </message>
   <message name="IDS_SETTINGS_PASSWORD_REMOVE_DIALOG_TITLE" desc="Title for the dialog that asks the user which versions of a password to remove (device, Google Account or both).">
     Delete password?

chrome/app/settings_strings_grdp/IDS_SETTINGS_PASSWORD_MOVE_TO_ACCOUNT_DIALOG_CANCEL_BUTTON_TEXT.png.sha1

-25f8f6709956367a56fef4b13a7877f7896cefed
\ No newline at end of file
+30f492c6f7b9086acf66d2b2b24fbd54781f2c34
\ No newline at end of file

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

@@ -242,10 +242,12 @@ MoveToAccountStoreBubbleView::MoveToAccountStoreBubbleView(
       /*from_view=*/std::move(computer_view),
       /*to_view=*/std::move(avatar_view)));
 
-  SetButtonLabel(ui::DIALOG_BUTTON_OK,
-                 l10n_util::GetStringUTF16(IDS_PASSWORD_MANAGER_MOVE_BUTTON));
+  SetButtonLabel(
+      ui::DIALOG_BUTTON_OK,
+      l10n_util::GetStringUTF16(IDS_PASSWORD_MANAGER_MOVE_BUBBLE_OK_BUTTON));
   SetButtonLabel(ui::DIALOG_BUTTON_CANCEL,
-                 l10n_util::GetStringUTF16(IDS_DECLINE_RECOVERY));
+                 l10n_util::GetStringUTF16(
+                     IDS_PASSWORD_MANAGER_MOVE_BUBBLE_CANCEL_BUTTON));
   SetAcceptCallback(
       base::BindOnce(&MoveToAccountStoreBubbleController::AcceptMove,
                      base::Unretained(&controller_)));

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

@@ -70,10 +70,12 @@ TEST_F(MoveToAccountStoreBubbleViewTest, MAYBE_HasTwoButtons) {
   CreateViewAndShow();
   ASSERT_TRUE(view_->GetOkButton());
   ASSERT_TRUE(view_->GetCancelButton());
-  EXPECT_EQ(l10n_util::GetStringUTF16(IDS_PASSWORD_MANAGER_MOVE_BUTTON),
-            view_->GetDialogButtonLabel(ui::DIALOG_BUTTON_OK));
-  EXPECT_EQ(l10n_util::GetStringUTF16(IDS_DECLINE_RECOVERY),
-            view_->GetDialogButtonLabel(ui::DIALOG_BUTTON_CANCEL));
+  EXPECT_EQ(
+      l10n_util::GetStringUTF16(IDS_PASSWORD_MANAGER_MOVE_BUBBLE_OK_BUTTON),
+      view_->GetDialogButtonLabel(ui::DIALOG_BUTTON_OK));
+  EXPECT_EQ(
+      l10n_util::GetStringUTF16(IDS_PASSWORD_MANAGER_MOVE_BUBBLE_CANCEL_BUTTON),
+      view_->GetDialogButtonLabel(ui::DIALOG_BUTTON_CANCEL));
 }
 
 // Flaky on Windows due to http://crbug.com/968222