Separate out some more ICU from base and into base/i18n....

chrome/browser/task_manager.cc

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/compiler_specific.h"
+#include "base/i18n/number_formatting.h"
 #include "base/process_util.h"
 #include "base/stats_table.h"
 #include "base/string_util.h"
 #include "base/thread.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/net/url_request_tracking.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
 #include "chrome/browser/task_manager_resource_providers.h"
@@ skipping 101 matching lines @@
 }
 
 std::wstring TaskManagerModel::GetResourcePrivateMemory(int index) const {
   DCHECK(index < ResourceCount());
   // We report committed (working set + paged) private usage. This is NOT
   // going to match what Windows Task Manager shows (which is working set).
   MetricsMap::const_iterator iter =
       metrics_map_.find(resources_[index]->GetProcess());
   DCHECK(iter != metrics_map_.end());
   base::ProcessMetrics* process_metrics = iter->second;
-  std::wstring number = FormatNumber(GetPrivateMemory(process_metrics));
-  return GetMemCellText(&number);
+  return GetMemCellText(GetPrivateMemory(process_metrics));
 }
 
 std::wstring TaskManagerModel::GetResourceSharedMemory(int index) const {
   DCHECK(index < ResourceCount());
   MetricsMap::const_iterator iter =
       metrics_map_.find(resources_[index]->GetProcess());
   DCHECK(iter != metrics_map_.end());
   base::ProcessMetrics* process_metrics = iter->second;
-  std::wstring number = FormatNumber(GetSharedMemory(process_metrics));
-  return GetMemCellText(&number);
+  return GetMemCellText(GetSharedMemory(process_metrics));
 }
 
 std::wstring TaskManagerModel::GetResourcePhysicalMemory(int index) const {
   DCHECK(index < ResourceCount());
   MetricsMap::const_iterator iter =
       metrics_map_.find(resources_[index]->GetProcess());
   DCHECK(iter != metrics_map_.end());
   base::ProcessMetrics* process_metrics = iter->second;
-  std::wstring number = FormatNumber(GetPhysicalMemory(process_metrics));
-  return GetMemCellText(&number);
+  return GetMemCellText(GetPhysicalMemory(process_metrics));
 }
 
 std::wstring TaskManagerModel::GetResourceProcessId(int index) const {
   DCHECK(index < ResourceCount());
   return IntToWString(base::GetProcId(resources_[index]->GetProcess()));
 }
 
 std::wstring TaskManagerModel::GetResourceStatsValue(int index, int col_id)
     const {
   DCHECK(index < ResourceCount());
   return IntToWString(GetStatsValue(resources_[index], col_id));
 }
 
 std::wstring TaskManagerModel::GetResourceGoatsTeleported(int index) const {
   DCHECK(index < ResourceCount());
   goats_teleported_ += rand() & 4095;
-  return FormatNumber(goats_teleported_);
+  return UTF16ToWide(base::FormatNumber(goats_teleported_));
 }
 
 std::wstring TaskManagerModel::GetResourceWebCoreImageCacheSize(
     int index) const {
   DCHECK(index < ResourceCount());
   if (!resources_[index]->ReportsCacheStats())
     return l10n_util::GetString(IDS_TASK_MANAGER_NA_CELL_TEXT);
   const WebKit::WebCache::ResourceTypeStats stats(
       resources_[index]->GetWebCoreCacheStats());
   return FormatStatsSize(stats.images);
@@ skipping 198 matching lines @@
     if (counter != NULL && counter[0] != '\0') {
       return table->GetCounterValue(counter,
           base::GetProcId(resource->GetProcess()));
      } else {
         NOTREACHED() << "Invalid column.";
      }
   }
   return 0;
 }
 
-std::wstring TaskManagerModel::GetMemCellText(
-    std::wstring* number) const {
+std::wstring TaskManagerModel::GetMemCellText(int64 number) const {
+  std::wstring str = UTF16ToWide(base::FormatNumber(number));
+
   // Adjust number string if necessary.
-  l10n_util::AdjustStringForLocaleDirection(*number, number);
-  return l10n_util::GetStringF(IDS_TASK_MANAGER_MEM_CELL_TEXT, *number);
+  l10n_util::AdjustStringForLocaleDirection(str, &str);
+  return l10n_util::GetStringF(IDS_TASK_MANAGER_MEM_CELL_TEXT, str);
 }
 
 void TaskManagerModel::StartUpdating() {
   DCHECK_NE(TASK_PENDING, update_state_);
 
   // If update_state_ is STOPPING, it means a task is still pending.  Setting
   // it to TASK_PENDING ensures the tasks keep being posted (by Refresh()).
   if (update_state_ == IDLE) {
       MessageLoop::current()->PostDelayedTask(FROM_HERE,
           NewRunnableMethod(this, &TaskManagerModel::Refresh),
@@ skipping 411 matching lines @@
 
 void TaskManager::OnWindowClosed() {
   model_->StopUpdating();
   model_->Clear();
 }
 
 // static
 TaskManager* TaskManager::GetInstance() {
   return Singleton<TaskManager>::get();
 }