Revert 70281 - Revert 70271 - Remove wstring from l10n_util. Part 3....

chrome/browser/task_manager/task_manager_resource_providers.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/task_manager/task_manager_resource_providers.h"
 
 #include "build/build_config.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 153 matching lines @@
 
 TaskManagerTabContentsResource::~TaskManagerTabContentsResource() {
 }
 
 TaskManager::Resource::Type TaskManagerTabContentsResource::GetType() const {
   return tab_contents_->HostsExtension() ? EXTENSION : RENDERER;
 }
 
 std::wstring TaskManagerTabContentsResource::GetTitle() const {
   // Fall back on the URL if there's no title.
-  std::wstring tab_title(UTF16ToWideHack(tab_contents_->GetTitle()));
+  string16 tab_title = tab_contents_->GetTitle();
   if (tab_title.empty()) {
-    tab_title = UTF8ToWide(tab_contents_->GetURL().spec());
+    tab_title = UTF8ToUTF16(tab_contents_->GetURL().spec());
     // Force URL to be LTR.
-    tab_title = UTF16ToWide(base::i18n::GetDisplayStringInLTRDirectionality(
-        WideToUTF16(tab_title)));
+    tab_title = base::i18n::GetDisplayStringInLTRDirectionality(tab_title);
   } else {
     // Since the tab_title will be concatenated with
     // IDS_TASK_MANAGER_TAB_PREFIX, we need to explicitly set the tab_title to
     // be LTR format if there is no strong RTL charater in it. Otherwise, if
     // IDS_TASK_MANAGER_TAB_PREFIX is an RTL word, the concatenated result
     // might be wrong. For example, http://mail.yahoo.com, whose title is
     // "Yahoo! Mail: The best web-based Email!", without setting it explicitly
     // as LTR format, the concatenated result will be "!Yahoo! Mail: The best
     // web-based Email :BAT", in which the capital letters "BAT" stands for
     // the Hebrew word for "tab".
     base::i18n::AdjustStringForLocaleDirection(&tab_title);
   }
 
   ExtensionService* extensions_service =
       tab_contents_->profile()->GetExtensionService();
   int message_id = GetMessagePrefixID(
       extensions_service->IsInstalledApp(tab_contents_->GetURL()),
       tab_contents_->HostsExtension(),
       tab_contents_->profile()->IsOffTheRecord());
-  return l10n_util::GetStringF(message_id, tab_title);
+  return UTF16ToWideHack(l10n_util::GetStringFUTF16(message_id, tab_title));
 }
 
 SkBitmap TaskManagerTabContentsResource::GetIcon() const {
   return tab_contents_->GetFavIcon();
 }
 
 TabContents* TaskManagerTabContentsResource::GetTabContents() const {
   return static_cast<TabContents*>(tab_contents_);
 }
 
@@ skipping 198 matching lines @@
   // Ensure that the string has the appropriate direction markers (see comment
   // in TaskManagerTabContentsResource::GetTitle()).
   base::i18n::AdjustStringForLocaleDirection(&application_name_);
 }
 
 TaskManagerBackgroundContentsResource::~TaskManagerBackgroundContentsResource(
     ) {
 }
 
 std::wstring TaskManagerBackgroundContentsResource::GetTitle() const {
-  std::wstring title = application_name_;
+  string16 title = WideToUTF16Hack(application_name_);
 
   if (title.empty()) {
     // No title (can't locate the parent app for some reason) so just display
     // the URL (properly forced to be LTR).
-    title = UTF16ToWide(base::i18n::GetDisplayStringInLTRDirectionality(
-        UTF8ToUTF16(background_contents_->GetURL().spec())));
+    title = base::i18n::GetDisplayStringInLTRDirectionality(
+        UTF8ToUTF16(background_contents_->GetURL().spec()));
   }
-  return l10n_util::GetStringF(IDS_TASK_MANAGER_BACKGROUND_PREFIX, title);
+  return UTF16ToWideHack(
+      l10n_util::GetStringFUTF16(IDS_TASK_MANAGER_BACKGROUND_PREFIX, title));
 }
 
 
 SkBitmap TaskManagerBackgroundContentsResource::GetIcon() const {
   return *default_icon_;
 }
 
 bool TaskManagerBackgroundContentsResource::IsBackground() const {
   return true;
 }
@@ skipping 437 matching lines @@
 
 TaskManagerExtensionProcessResource::TaskManagerExtensionProcessResource(
     ExtensionHost* extension_host)
     : extension_host_(extension_host) {
   if (!default_icon_) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     default_icon_ = rb.GetBitmapNamed(IDR_PLUGIN);
   }
   process_handle_ = extension_host_->render_process_host()->GetHandle();
   pid_ = base::GetProcId(process_handle_);
-  std::wstring extension_name(UTF8ToWide(GetExtension()->name()));
+  string16 extension_name = UTF8ToUTF16(GetExtension()->name());
   DCHECK(!extension_name.empty());
 
   int message_id = GetMessagePrefixID(GetExtension()->is_app(), true,
       extension_host_->profile()->IsOffTheRecord());
-  title_ = l10n_util::GetStringF(message_id, extension_name);
+  title_ = UTF16ToWideHack(l10n_util::GetStringFUTF16(message_id,
+                                                      extension_name));
 }
 
 TaskManagerExtensionProcessResource::~TaskManagerExtensionProcessResource() {
 }
 
 std::wstring TaskManagerExtensionProcessResource::GetTitle() const {
   return title_;
 }
 
 SkBitmap TaskManagerExtensionProcessResource::GetIcon() const {
@@ skipping 356 matching lines @@
 #endif  // defined(OS_WIN)
 }
 
 TaskManagerBrowserProcessResource::~TaskManagerBrowserProcessResource() {
   base::CloseProcessHandle(process_);
 }
 
 // TaskManagerResource methods:
 std::wstring TaskManagerBrowserProcessResource::GetTitle() const {
   if (title_.empty()) {
-    title_ = l10n_util::GetString(IDS_TASK_MANAGER_WEB_BROWSER_CELL_TEXT);
+    title_ = UTF16ToWideHack(
+        l10n_util::GetStringUTF16(IDS_TASK_MANAGER_WEB_BROWSER_CELL_TEXT));
   }
   return title_;
 }
 
 SkBitmap TaskManagerBrowserProcessResource::GetIcon() const {
   return *default_icon_;
 }
 
 size_t TaskManagerBrowserProcessResource::SqliteMemoryUsedBytes() const {
   return static_cast<size_t>(sqlite3_memory_used());
@@ skipping 43 matching lines @@
 
   return &resource_;
 }
 
 void TaskManagerBrowserProcessResourceProvider::StartUpdating() {
   task_manager_->AddResource(&resource_);
 }
 
 void TaskManagerBrowserProcessResourceProvider::StopUpdating() {
 }