Use generic Cancel for Firefox import dialog.

Removes IDS_IMPORTER_LOCK_CANCEL as the dialog is no longer intended to
be distinguished from other Cancel button labels.

This specialized label caused translation confusion as it looks like it
is intended to be specialized for the import dialog but is not "Cancel
import" or similarly specialized content.

Bug: b:68235708, chromium:754034
Change-Id: I15e35d90eafb621ce6a5d90a0e573edceae99ef1
Reviewed-on: https://chromium-review.googlesource.com/747633Reviewed-by: Trent Apted <tapted@chromium.org>
Reviewed-by: Bret Sepulveda <bsep@chromium.org>
Commit-Queue: Peter Boström <pbos@chromium.org>
Cr-Commit-Position: refs/heads/master@{#513011}

chrome/app/generated_resources.grd

@@ -5507,9 +5507,6 @@ the Bookmarks menu.">
         <message name="IDS_IMPORTER_LOCK_OK" desc="Text for OK button (to try importing again) on importer lock dialog">
           Try Again
         </message>
-        <message name="IDS_IMPORTER_LOCK_CANCEL" desc="Text for Cancel button on importer lock dialog">
-          Cancel
-        </message>
       </if>
       <if expr="not use_titlecase">
         <message name="IDS_IMPORTER_LOCK_TITLE" desc="Dialog title for importer lock dialog">
@@ -5518,9 +5515,6 @@ the Bookmarks menu.">
         <message name="IDS_IMPORTER_LOCK_OK" desc="Text for OK button (to try importing again) on importer lock dialog">
           Try again
         </message>
-        <message name="IDS_IMPORTER_LOCK_CANCEL" desc="Text for Cancel button on importer lock dialog">
-          Cancel
-        </message>
       </if>
 
       <if expr="enable_extensions">

chrome/browser/ui/cocoa/importer/import_lock_dialog_cocoa.mm

@@ -13,6 +13,7 @@
 #include "chrome/browser/ui/cocoa/browser_dialogs_views_mac.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
+#include "components/strings/grit/components_strings.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 
 using base::UserMetricsAction;
@@ -27,8 +28,7 @@ void ShowImportLockDialog(gfx::NativeWindow parent,
   base::scoped_nsobject<NSAlert> lock_alert([[NSAlert alloc] init]);
   [lock_alert addButtonWithTitle:l10n_util::GetNSStringWithFixup(
       IDS_IMPORTER_LOCK_OK)];
-  [lock_alert addButtonWithTitle:l10n_util::GetNSStringWithFixup(
-      IDS_IMPORTER_LOCK_CANCEL)];
+  [lock_alert addButtonWithTitle:l10n_util::GetNSStringWithFixup(IDS_CANCEL)];
   [lock_alert setInformativeText:l10n_util::GetNSStringWithFixup(
       IDS_IMPORTER_LOCK_TEXT)];
   [lock_alert setMessageText:l10n_util::GetNSStringWithFixup(

chrome/browser/ui/views/importer/import_lock_dialog_view.cc

@@ -71,8 +71,9 @@ gfx::Size ImportLockDialogView::CalculatePreferredSize() const {
 
 base::string16 ImportLockDialogView::GetDialogButtonLabel(
     ui::DialogButton button) const {
-  return l10n_util::GetStringUTF16((button == ui::DIALOG_BUTTON_OK) ?
-      IDS_IMPORTER_LOCK_OK : IDS_IMPORTER_LOCK_CANCEL);
+  if (button == ui::DIALOG_BUTTON_OK)
+    return l10n_util::GetStringUTF16(IDS_IMPORTER_LOCK_OK);
+  return DialogDelegateView::GetDialogButtonLabel(button);
 }
 
 base::string16 ImportLockDialogView::GetWindowTitle() const {