Convert TimeFormat (chrome/common/time_format.*) to string16 (from wstring).

chrome/browser/download/download_util.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.
 //
 // Download utility implementation
 
 #include "chrome/browser/download/download_util.h"
 
 #if defined(OS_WIN)
 #include <shobjidl.h>
 #endif
 #include <string>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/file_util.h"
 #include "base/i18n/rtl.h"
 #include "base/i18n/time_formatting.h"
 #include "base/path_service.h"
 #include "base/singleton.h"
+#include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/download/download_item.h"
 #include "chrome/browser/download/download_item_model.h"
@@ skipping 499 matching lines @@
 void DragDownload(const DownloadItem* download,
                   SkBitmap* icon,
                   gfx::NativeView view) {
   DownloadItemDrag::BeginDrag(download, icon);
 }
 #endif  // USE_X11
 
 DictionaryValue* CreateDownloadItemValue(DownloadItem* download, int id) {
   DictionaryValue* file_value = new DictionaryValue();
 
-  file_value->SetInteger(L"started",
-    static_cast<int>(download->start_time().ToTimeT()));
-  file_value->SetString(L"since_string",
-    TimeFormat::RelativeDate(download->start_time(), NULL));
-  file_value->SetString(L"date_string",
-    base::TimeFormatShortDate(download->start_time()));
-  file_value->SetInteger(L"id", id);
-  file_value->SetString(L"file_path", download->full_path().ToWStringHack());
+  file_value->SetInteger("started",
+      static_cast<int>(download->start_time().ToTimeT()));
+  file_value->SetString("since_string",
+      TimeFormat::RelativeDate(download->start_time(), NULL));
+  file_value->SetString("date_string",
+      WideToUTF16Hack(base::TimeFormatShortDate(download->start_time())));
+  file_value->SetInteger("id", id);
+  file_value->SetString("file_path",
+      WideToUTF16Hack(download->full_path().ToWStringHack()));
   // Keep file names as LTR.
   std::wstring file_name = download->GetFileName().ToWStringHack();
   base::i18n::GetDisplayStringInLTRDirectionality(&file_name);
-  file_value->SetString(L"file_name", file_name);
-  file_value->SetString(L"url", download->url().spec());
-  file_value->SetBoolean(L"otr", download->is_otr());
+  file_value->SetString("file_name", WideToUTF16Hack(file_name));
+  file_value->SetString("url", download->url().spec());
+  file_value->SetBoolean("otr", download->is_otr());
 
   if (download->state() == DownloadItem::IN_PROGRESS) {
     if (download->safety_state() == DownloadItem::DANGEROUS) {
-      file_value->SetString(L"state", L"DANGEROUS");
+      file_value->SetString("state", "DANGEROUS");
     } else if (download->is_paused()) {
-      file_value->SetString(L"state", L"PAUSED");
+      file_value->SetString("state", "PAUSED");
     } else {
-      file_value->SetString(L"state", L"IN_PROGRESS");
+      file_value->SetString("state", "IN_PROGRESS");
     }
 
-    file_value->SetString(L"progress_status_text",
-       GetProgressStatusText(download));
+    file_value->SetString("progress_status_text",
+       WideToUTF16Hack(GetProgressStatusText(download)));
 
-    file_value->SetInteger(L"percent",
+    file_value->SetInteger("percent",
         static_cast<int>(download->PercentComplete()));
-    file_value->SetInteger(L"received",
+    file_value->SetInteger("received",
         static_cast<int>(download->received_bytes()));
   } else if (download->state() == DownloadItem::CANCELLED) {
-    file_value->SetString(L"state", L"CANCELLED");
+    file_value->SetString("state", "CANCELLED");
   } else if (download->state() == DownloadItem::COMPLETE) {
     if (download->safety_state() == DownloadItem::DANGEROUS) {
-      file_value->SetString(L"state", L"DANGEROUS");
+      file_value->SetString("state", "DANGEROUS");
     } else {
-      file_value->SetString(L"state", L"COMPLETE");
+      file_value->SetString("state", "COMPLETE");
     }
   }
 
-  file_value->SetInteger(L"total",
+  file_value->SetInteger("total",
       static_cast<int>(download->total_bytes()));
 
   return file_value;
 }
 
 std::wstring GetProgressStatusText(DownloadItem* download) {
   int64 total = download->total_bytes();
   int64 size = download->received_bytes();
   DataUnits amount_units = GetByteDisplayUnits(size);
   std::wstring received_size = FormatBytes(size, amount_units, true);
@@ skipping 23 matching lines @@
   }
   amount_units = GetByteDisplayUnits(download->CurrentSpeed());
   std::wstring speed_text = FormatSpeed(download->CurrentSpeed(),
                                         amount_units, true);
   std::wstring speed_text_localized;
   if (base::i18n::AdjustStringForLocaleDirection(speed_text,
                                                  &speed_text_localized))
     speed_text.assign(speed_text_localized);
 
   base::TimeDelta remaining;
-  std::wstring time_remaining;
+  string16 time_remaining;
   if (download->is_paused())
-    time_remaining = l10n_util::GetString(IDS_DOWNLOAD_PROGRESS_PAUSED);
+    time_remaining = l10n_util::GetStringUTF16(IDS_DOWNLOAD_PROGRESS_PAUSED);
   else if (download->TimeRemaining(&remaining))
     time_remaining = TimeFormat::TimeRemaining(remaining);
 
   if (time_remaining.empty()) {
     return l10n_util::GetStringF(IDS_DOWNLOAD_TAB_PROGRESS_STATUS_TIME_UNKNOWN,
                                  speed_text, amount);
   }
   return l10n_util::GetStringF(IDS_DOWNLOAD_TAB_PROGRESS_STATUS, speed_text,
-                               amount, time_remaining);
+                               amount, UTF16ToWideHack(time_remaining));
 }
 
 #if !defined(OS_MACOSX)
 void UpdateAppIconDownloadProgress(int download_count,
                                    bool progress_known,
                                    float progress) {
 #if defined(OS_WIN)
   // Taskbar progress bar is only supported on Win7.
   if (win_util::GetWinVersion() < win_util::WINVERSION_WIN7)
     return;
@@ skipping 105 matching lines @@
 }
 
 FilePath GetCrDownloadPath(const FilePath& suggested_path) {
   FilePath::StringType file_name;
   SStringPrintf(&file_name, PRFilePathLiteral FILE_PATH_LITERAL(".crdownload"),
                 suggested_path.value().c_str());
   return FilePath(file_name);
 }
 
 }  // namespace download_util