Remove wstring from l10n_util. Part 2....

chrome/browser/download/download_item_model.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/download/download_item_model.h"
 
 #include "app/l10n_util.h"
 #include "base/i18n/number_formatting.h"
 #include "base/i18n/rtl.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/download/download_item.h"
 #include "chrome/browser/download/save_package.h"
 #include "chrome/common/time_format.h"
 #include "grit/generated_resources.h"
 
 using base::TimeDelta;
 
 // -----------------------------------------------------------------------------
 // DownloadItemModel
 
 DownloadItemModel::DownloadItemModel(DownloadItem* download)
     : BaseDownloadItemModel(download) {
 }
 
 void DownloadItemModel::CancelTask() {
   download_->Cancel(true /* update history service */);
 }
 
-std::wstring DownloadItemModel::GetStatusText() {
+string16 DownloadItemModel::GetStatusText() {
   int64 size = download_->received_bytes();
   int64 total = download_->total_bytes();
 
   DataUnits amount_units = GetByteDisplayUnits(total);
   const string16 simple_size = FormatBytes(size, amount_units, false);
 
   // In RTL locales, we render the text "size/total" in an RTL context. This
   // is problematic since a string such as "123/456 MB" is displayed
   // as "MB 123/456" because it ends with an LTR run. In order to solve this,
   // we mark the total string as an LTR string if the UI layout is
@@ skipping 41 matching lines @@
       break;
     case DownloadItem::CANCELLED:
       status_text = l10n_util::GetStringUTF16(IDS_DOWNLOAD_STATUS_CANCELED);
       break;
     case DownloadItem::REMOVING:
       break;
     default:
       NOTREACHED();
   }
 
-  return UTF16ToWideHack(status_text);
+  return status_text;
 }
 
 // -----------------------------------------------------------------------------
 // SavePageModel
 
 SavePageModel::SavePageModel(SavePackage* save, DownloadItem* download)
     : BaseDownloadItemModel(download),
       save_(save) {
 }
 
 void SavePageModel::CancelTask() {
   save_->Cancel(true);
 }
 
-std::wstring SavePageModel::GetStatusText() {
+string16 SavePageModel::GetStatusText() {
   int64 size = download_->received_bytes();
   int64 total_size = download_->total_bytes();
 
-  std::wstring status_text;
+  string16 status_text;
   switch (download_->state()) {
     case DownloadItem::IN_PROGRESS:
-      status_text = l10n_util::GetStringF(
+      status_text = l10n_util::GetStringFUTF16(
           IDS_SAVE_PAGE_PROGRESS,
-          UTF16ToWide(base::FormatNumber(size)),
-          UTF16ToWide(base::FormatNumber(total_size)));
+          base::FormatNumber(size),
+          base::FormatNumber(total_size));
       break;
     case DownloadItem::COMPLETE:
-      status_text = l10n_util::GetString(IDS_SAVE_PAGE_STATUS_COMPLETED);
+      status_text = l10n_util::GetStringUTF16(IDS_SAVE_PAGE_STATUS_COMPLETED);
       break;
     case DownloadItem::CANCELLED:
-      status_text = l10n_util::GetString(IDS_SAVE_PAGE_STATUS_CANCELED);
+      status_text = l10n_util::GetStringUTF16(IDS_SAVE_PAGE_STATUS_CANCELED);
       break;
     case DownloadItem::REMOVING:
       break;
     default:
       NOTREACHED();
   }
 
   return status_text;
 }