Harmony - Changed button and body text on CriticalNotificationBubbleView

Removed IDS_CRITICAL_NOTIFICATION_RESTART; use IDS_CANCEL instead.
Reworded IDS_CRITICAL_NOTIFICATION_TEXT content per referenced bug.

TBR=cpu@chromium.org

Bug: 763227
Change-Id: Ie8bf0157da2a62f0e1d32807b9b5ea022d02bd49
Reviewed-on: https://chromium-review.googlesource.com/c/938186Reviewed-by: Peter Kasting <pkasting@chromium.org>
Commit-Queue: Allen Bauer <kylixrd@chromium.org>
Cr-Commit-Position: refs/heads/master@{#610166}

chrome/app/chromium_strings.grd

@@ -1022,10 +1022,10 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2<ex>jane.doe@example.com</
          other {Chromium will restart in # seconds}}
       </message>
       <message name="IDS_CRITICAL_NOTIFICATION_TITLE_ALTERNATE" desc="The title for a bubble that appears when there is a critical update and Chromium must restart to install it. The title was previously countng down to an automatic restart and now it has finished. Will only be seen if a web page stops the shutdown process.">
-        You should restart Chromium now.
+        You should restart Chromium now
       </message>
       <message name="IDS_CRITICAL_NOTIFICATION_TEXT" desc="Explanation text for the bubble that appears when there is a critical update and Chromium must restart to install it.">
-        A special security update for Chromium was just applied; you should restart now for it to take effect (we'll restore your tabs).
+        A special security update for Chromium was just applied. Restart now and we'll restore your tabs.
       </message>
 
       <!-- Dialog that asks whether user wants to participate in Safe Browsing Extended Reporting -->

chrome/app/generated_resources.grd

@@ -3256,9 +3256,6 @@ are declared in tools/grit/grit_rule.gni.
       <message name="IDS_CRITICAL_NOTIFICATION_RESTART" desc="Button label a button on the bubble that appears when there is a critical update and Chrome/Chromium must restart to install it. Pressing the buton will cause Chrome/Chromium to restart.">
         Restart now
       </message>
-      <message name="IDS_CRITICAL_NOTIFICATION_DISMISS" desc="Button label a button on the bubble that appears when there is a critical update and Chrome/Chromium must restart to install it. Pressing the buton will prevent Chrome/Chromium from automatically restarting.">
-        Don't restart
-      </message>
 
       <!-- Extension/App disabled notification -->
       <message name="IDS_EXTENSION_DISABLED_ERROR_LABEL" desc="Text displayed when an extension was disabled due to a new upgrade requiring an explicit permission check from the user.">

chrome/app/google_chrome_strings.grd

@@ -1040,10 +1040,10 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2<ex>jane.doe@example.com</
          other {Google Chrome will restart in # seconds}}
       </message>
       <message name="IDS_CRITICAL_NOTIFICATION_TITLE_ALTERNATE" desc="The title for a bubble that appears when there is a critical update and Chrome must restart to install it. The title was previously countng down to an automatic restart and now it has finished. Will only be seen if a web page stops the shutdown process.">
-        You should restart Google Chrome now.
+        You should restart Google Chrome now
       </message>
       <message name="IDS_CRITICAL_NOTIFICATION_TEXT" desc="Explanation text for the bubble that appears when there is a critical update and Chrome must restart to install it.">
-        A special security update for Google Chrome was just applied; you should restart now for it to take effect (we'll restore your tabs).
+        A special security update for Google Chrome was just applied. Restart now and we'll restore your tabs.
       </message>
 
       <!-- Dialog that asks whether user wants to participate in Safe Browsing Extended Reporting -->

chrome/browser/ui/views/critical_notification_bubble_view.cc

@@ -16,6 +16,7 @@
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/locale_settings.h"
 #include "components/prefs/pref_service.h"
+#include "components/strings/grit/components_strings.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
@@ -115,7 +116,7 @@ bool CriticalNotificationBubbleView::Accept() {
 base::string16 CriticalNotificationBubbleView::GetDialogButtonLabel(
     ui::DialogButton button) const {
   return l10n_util::GetStringUTF16(button == ui::DIALOG_BUTTON_CANCEL
-                                       ? IDS_CRITICAL_NOTIFICATION_DISMISS
+                                       ? IDS_CANCEL
                                        : IDS_CRITICAL_NOTIFICATION_RESTART);
 }