Use ICU plural syntax in more place

chrome/browser/ui/views/download/download_in_progress_dialog_view.cc

Index: chrome/browser/ui/views/download/download_in_progress_dialog_view.cc
diff --git a/chrome/browser/ui/views/download/download_in_progress_dialog_view.cc b/chrome/browser/ui/views/download/download_in_progress_dialog_view.cc
index 13a1da9e36f14f5b1d86598d66707eb1b81e8033..ae110d2b45df4b80276e892ef70fa36d0de37d14 100644
--- a/chrome/browser/ui/views/download/download_in_progress_dialog_view.cc
+++ b/chrome/browser/ui/views/download/download_in_progress_dialog_view.cc
@@ -40,34 +40,12 @@ DownloadInProgressDialogView::DownloadInProgressDialogView(
   base::string16 explanation_text;
   switch (dialog_type) {

[Peter Kasting, 2015/05/12 21:52:03]

Nit: Simpler:

  DCHECK_NE(Browser::DOWNLOAD_CLOSE_OK, dialog_type);
  base::string16 explanation_text(l10n_util::GetPluralStringFUTF16(
      (dialog_type == Browser::DOWNLOAD_CLOSE_BROWSER_SHUTDOWN)
          ? IDS_DOWNLOAD_REMOVE_CONFIRM_EXPLANATION
          : IDS_INCOGNITO_DOWNLOAD_REMOVE_CONFIRM_EXPLANATION,
      download_count));

     case Browser::DOWNLOAD_CLOSE_BROWSER_SHUTDOWN:
-      if (download_count == 1) {
-        title_text_ = l10n_util::GetStringUTF16(
-            IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_TITLE);
-        explanation_text = l10n_util::GetStringUTF16(
-            IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_EXPLANATION);
-      } else {
-        title_text_ = l10n_util::GetStringUTF16(
-            IDS_MULTIPLE_DOWNLOADS_REMOVE_CONFIRM_TITLE);
-        explanation_text = l10n_util::GetStringUTF16(
-            IDS_MULTIPLE_DOWNLOADS_REMOVE_CONFIRM_EXPLANATION);
-      }
-      ok_button_text_ = l10n_util::GetStringUTF16(
-          IDS_DOWNLOAD_REMOVE_CONFIRM_OK_BUTTON_LABEL);
+      explanation_text = l10n_util::GetPluralStringFUTF16(
+          IDS_DOWNLOAD_REMOVE_CONFIRM_EXPLANATION, download_count);
       break;
     case Browser::DOWNLOAD_CLOSE_LAST_WINDOW_IN_INCOGNITO_PROFILE:
-      if (download_count == 1) {
-        title_text_ = l10n_util::GetStringUTF16(
-            IDS_SINGLE_INCOGNITO_DOWNLOAD_REMOVE_CONFIRM_TITLE);
-        explanation_text = l10n_util::GetStringUTF16(
-            IDS_SINGLE_INCOGNITO_DOWNLOAD_REMOVE_CONFIRM_EXPLANATION);
-      } else {
-        title_text_ = l10n_util::GetStringUTF16(
-            IDS_MULTIPLE_INCOGNITO_DOWNLOADS_REMOVE_CONFIRM_TITLE);
-        explanation_text = l10n_util::GetStringUTF16(
-            IDS_MULTIPLE_INCOGNITO_DOWNLOADS_REMOVE_CONFIRM_EXPLANATION);
-      }
-      ok_button_text_ = l10n_util::GetStringUTF16(
-          IDS_INCOGNITO_DOWNLOAD_REMOVE_CONFIRM_OK_BUTTON_LABEL);
+      explanation_text = l10n_util::GetPluralStringFUTF16(
+          IDS_INCOGNITO_DOWNLOAD_REMOVE_CONFIRM_EXPLANATION, download_count);
       break;
     default:
       // This dialog should have been created within the same thread invocation
@@ -75,8 +53,12 @@ DownloadInProgressDialogView::DownloadInProgressDialogView(
       // to close.
       NOTREACHED();
   }
-  cancel_button_text_ = l10n_util::GetStringUTF16(
-      IDS_DOWNLOAD_REMOVE_CONFIRM_CANCEL_BUTTON_LABEL);
+  title_text_ = l10n_util::GetPluralStringFUTF16(
+      IDS_DOWNLOAD_REMOVE_CONFIRM_TITLE, download_count);
+  ok_button_text_ = l10n_util::GetPluralStringFUTF16(
+      IDS_DOWNLOAD_REMOVE_CONFIRM_OK_BUTTON_LABEL, download_count);
+  cancel_button_text_ = l10n_util::GetPluralStringFUTF16(
+      IDS_DOWNLOAD_REMOVE_CONFIRM_CANCEL_BUTTON_LABEL, download_count);
 
   message_box_view_ = new views::MessageBoxView(
       views::MessageBoxView::InitParams(explanation_text));