Convert FormatBytes to string16.

chrome/browser/task_manager.cc

Index: chrome/browser/task_manager.cc
diff --git a/chrome/browser/task_manager.cc b/chrome/browser/task_manager.cc
index 0553ab0b842b35fc5ead4e111ac158970ef5518e..0c151fc059db9b7b91370e530c580d8d28378027 100644
--- a/chrome/browser/task_manager.cc
+++ b/chrome/browser/task_manager.cc
@@ -59,8 +59,8 @@ int ValueCompare(T value1, T value2) {
 
 string16 FormatStatsSize(const WebKit::WebCache::ResourceTypeStat& stat) {
   return l10n_util::GetStringFUTF16(IDS_TASK_MANAGER_CACHE_SIZE_CELL_TEXT,
-      WideToUTF16Hack(FormatBytes(stat.size, DATA_UNITS_KIBIBYTE, false)),
-      WideToUTF16Hack(FormatBytes(stat.liveSize, DATA_UNITS_KIBIBYTE, false)));
+      FormatBytes(stat.size, DATA_UNITS_KIBIBYTE, false),
+      FormatBytes(stat.liveSize, DATA_UNITS_KIBIBYTE, false));
 }
 
 }  // namespace
@@ -127,7 +127,8 @@ string16 TaskManagerModel::GetResourceNetworkUsage(int index) const {
   if (net_usage == 0)
     return ASCIIToUTF16("0");
   std::wstring net_byte =
-      FormatSpeed(net_usage, GetByteDisplayUnits(net_usage), true);
+      UTF16ToWideHack(FormatSpeed(net_usage, GetByteDisplayUnits(net_usage),
+                                  true));
   // Force number string to have LTR directionality.
   base::i18n::GetDisplayStringInLTRDirectionality(&net_byte);
   return WideToUTF16Hack(net_byte);
@@ -218,12 +219,12 @@ string16 TaskManagerModel::GetResourceV8MemoryAllocatedSize(
   if (!resources_[index]->ReportsV8MemoryStats())
     return l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT);
   return l10n_util::GetStringFUTF16(IDS_TASK_MANAGER_CACHE_SIZE_CELL_TEXT,
-      WideToUTF16Hack(FormatBytes(resources_[index]->GetV8MemoryAllocated(),
-                                  DATA_UNITS_KIBIBYTE,
-                                  false)),
-      WideToUTF16Hack(FormatBytes(resources_[index]->GetV8MemoryUsed(),
-                                  DATA_UNITS_KIBIBYTE,
-                                  false)));
+      FormatBytes(resources_[index]->GetV8MemoryAllocated(),
+                  DATA_UNITS_KIBIBYTE,
+                  false),
+      FormatBytes(resources_[index]->GetV8MemoryUsed(),
+                  DATA_UNITS_KIBIBYTE,
+                  false));
 }
 
 bool TaskManagerModel::IsResourceFirstInGroup(int index) const {