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

chrome/browser/dom_ui/history2_ui.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/dom_ui/history2_ui.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/callback.h"
 #include "base/i18n/time_formatting.h"
 #include "base/message_loop.h"
 #include "base/singleton.h"
+#include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "base/string_piece.h"
+#include "base/utf_string_conversions.h"
 #include "base/thread.h"
 #include "base/time.h"
 #include "base/values.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/dom_ui/dom_ui_favicon_source.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/profile.h"
@@ skipping 231 matching lines @@
         static_cast<int>(page.visit_time().ToTimeT()));
 
     // Until we get some JS i18n infrastructure, we also need to
     // pass the dates in as strings. This could use some
     // optimization.
 
     // Only pass in the strings we need (search results need a shortdate
     // and snippet, browse results need day and time information).
     if (search_text_.empty()) {
       // Figure out the relative date string.
-      std::wstring date_str = TimeFormat::RelativeDate(page.visit_time(),
-                                                       &midnight_today);
+      string16 date_str = TimeFormat::RelativeDate(page.visit_time(),
+                                                   &midnight_today);
       if (date_str.empty()) {
-        date_str = base::TimeFormatFriendlyDate(page.visit_time());
+        date_str =
+            WideToUTF16Hack(base::TimeFormatFriendlyDate(page.visit_time()));
       } else {
-        date_str = l10n_util::GetStringF(
+        date_str = l10n_util::GetStringFUTF16(
             IDS_HISTORY_DATE_WITH_RELATIVE_TIME,
-            date_str, base::TimeFormatFriendlyDate(page.visit_time()));
+            date_str,
+            WideToUTF16Hack(base::TimeFormatFriendlyDate(page.visit_time())));
       }
-      page_value->SetString("dateRelativeDay", WideToUTF16Hack(date_str));
+      page_value->SetString("dateRelativeDay", date_str);
       page_value->SetString("dateTimeOfDay",
           WideToUTF16Hack(base::TimeFormatTimeOfDay(page.visit_time())));
     } else {
       page_value->SetString("dateShort",
           WideToUTF16Hack(base::TimeFormatShortDate(page.visit_time())));
       page_value->SetString("snippet", page.snippet().text());
     }
     page_value->SetBoolean("starred",
         dom_ui_->GetProfile()->GetBookmarkModel()->IsBookmarked(page.url()));
     results_value.Append(page_value);
@@ skipping 119 matching lines @@
 const GURL HistoryUI2::GetHistoryURLWithSearchText(const string16& text) {
   return GURL(std::string(chrome::kChromeUIHistory2URL) + "#q=" +
               EscapeQueryParamValue(UTF16ToUTF8(text), true));
 }
 
 // static
 RefCountedMemory* HistoryUI2::GetFaviconResourceBytes() {
   return ResourceBundle::GetSharedInstance().
       LoadDataResourceBytes(IDR_HISTORY_FAVICON);
 }