Change std::wstring to string16 for views::Label and views::Link

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 4cadace415ade50c9b1fc54ac9aba4d8ab6a4979..eb947a80dfd105e2e66460daf53b2083f9efdeaa 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
@@ -28,31 +28,31 @@ DownloadInProgressDialogView::DownloadInProgressDialogView(Browser* browser)
   int download_count = browser->profile()->GetDownloadManager()->
       in_progress_count();
 
-  std::wstring warning_text;
-  std::wstring explanation_text;
+  string16 warning_text;
+  string16 explanation_text;
   if (download_count == 1) {
-    warning_text = UTF16ToWide(l10n_util::GetStringFUTF16(
+    warning_text = l10n_util::GetStringFUTF16(
         IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_WARNING,
-        product_name_));
-    explanation_text = UTF16ToWide(l10n_util::GetStringFUTF16(
+        product_name_);
+    explanation_text = l10n_util::GetStringFUTF16(
         IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_EXPLANATION,
-        product_name_));
-    ok_button_text_ = UTF16ToWide(l10n_util::GetStringUTF16(
-        IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_OK_BUTTON_LABEL));
-    cancel_button_text_ = UTF16ToWide(l10n_util::GetStringUTF16(
-        IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_CANCEL_BUTTON_LABEL));
+        product_name_);
+    ok_button_text_ = l10n_util::GetStringUTF16(
+        IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_OK_BUTTON_LABEL);
+    cancel_button_text_ = l10n_util::GetStringUTF16(
+        IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_CANCEL_BUTTON_LABEL);
   } else {
-    warning_text = UTF16ToWide(l10n_util::GetStringFUTF16(
+    warning_text = l10n_util::GetStringFUTF16(
         IDS_MULTIPLE_DOWNLOADS_REMOVE_CONFIRM_WARNING,
         product_name_,
-        UTF8ToUTF16(base::IntToString(download_count))));
-    explanation_text = UTF16ToWide(l10n_util::GetStringFUTF16(
+        UTF8ToUTF16(base::IntToString(download_count)));
+    explanation_text = l10n_util::GetStringFUTF16(
         IDS_MULTIPLE_DOWNLOADS_REMOVE_CONFIRM_EXPLANATION,
-        product_name_));
-    ok_button_text_ = UTF16ToWide(l10n_util::GetStringUTF16(
-        IDS_MULTIPLE_DOWNLOADS_REMOVE_CONFIRM_OK_BUTTON_LABEL));
-    cancel_button_text_ = UTF16ToWide(l10n_util::GetStringUTF16(
-        IDS_MULTIPLE_DOWNLOADS_REMOVE_CONFIRM_CANCEL_BUTTON_LABEL));
+        product_name_);
+    ok_button_text_ = l10n_util::GetStringUTF16(
+        IDS_MULTIPLE_DOWNLOADS_REMOVE_CONFIRM_OK_BUTTON_LABEL);
+    cancel_button_text_ = l10n_util::GetStringUTF16(
+        IDS_MULTIPLE_DOWNLOADS_REMOVE_CONFIRM_CANCEL_BUTTON_LABEL);
   }
 
   // There are two lines of text: the bold warning label and the text
@@ -100,10 +100,10 @@ gfx::Size DownloadInProgressDialogView::GetPreferredSize() {
 std::wstring DownloadInProgressDialogView::GetDialogButtonLabel(
     MessageBoxFlags::DialogButton button) const {
   if (button == MessageBoxFlags::DIALOGBUTTON_OK)
-    return ok_button_text_;
+    return UTF16ToWideHack(ok_button_text_);
 
   DCHECK_EQ(MessageBoxFlags::DIALOGBUTTON_CANCEL, button);
-  return cancel_button_text_;
+  return UTF16ToWideHack(cancel_button_text_);
 }
 
 int DownloadInProgressDialogView::GetDefaultDialogButton() const {