Update file version info/memory details/process utils to use string16....

chrome/browser/memory_details.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/memory_details.h"
 
+#include "app/l10n_util.h"
 #include "base/file_version_info.h"
 #include "base/metrics/histogram.h"
 #include "base/process_util.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_child_process_host.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/renderer_host/backing_store_manager.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/url_constants.h"
 #include "grit/chromium_strings.h"
+#include "grit/generated_resources.h"
 
 #if defined(OS_LINUX)
 #include "chrome/browser/zygote_host_linux.h"
 #include "chrome/browser/renderer_host/render_sandbox_host_linux.h"
 #endif
 
 ProcessMemoryInformation::ProcessMemoryInformation()
     : pid(0),
       num_processes(0),
       is_diagnostics(false),
@@ skipping 50 matching lines @@
   std::vector<ProcessMemoryInformation> child_info;
 
   // Collect the list of child processes.
   for (BrowserChildProcessHost::Iterator iter; !iter.Done(); ++iter) {
     ProcessMemoryInformation info;
     info.pid = base::GetProcId(iter->handle());
     if (!info.pid)
       continue;
 
     info.type = iter->type();
-    info.titles.push_back(iter->name());
+    info.titles.push_back(WideToUTF16Hack(iter->name()));
     child_info.push_back(info);
   }
 
   // Now go do expensive memory lookups from the file thread.
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       NewRunnableMethod(this, &MemoryDetails::CollectProcessData, child_info));
 }
 
 void MemoryDetails::CollectChildInfoOnUIThread() {
@@ skipping 40 matching lines @@
         DCHECK(widget);
         if (!widget || !widget->IsRenderView())
           continue;
 
         const RenderViewHost* host = static_cast<const RenderViewHost*>(widget);
         TabContents* contents = NULL;
         if (host->delegate())
           contents = host->delegate()->GetAsTabContents();
         if (!contents)
           continue;
-        std::wstring title = UTF16ToWideHack(contents->GetTitle());
+        string16 title = contents->GetTitle();
         if (!title.length())
-          title = L"Untitled";
+          title = l10n_util::GetStringUTF16(IDS_DEFAULT_TAB_TITLE);
         process.titles.push_back(title);
 
         // We need to check the pending entry as well as the virtual_url to
         // see if it's an about:memory URL (we don't want to count these in the
         // total memory usage of the browser).
         //
         // When we reach here, about:memory will be the pending entry since we
         // haven't responded with any data such that it would be committed. If
         // you have another about:memory tab open (which would be committed),
         // we don't want to count it either, so we also check the last committed
@@ skipping 93 matching lines @@
   UMA_HISTOGRAM_COUNTS_100("Memory.ProcessCount",
       static_cast<int>(browser.processes.size()));
   UMA_HISTOGRAM_COUNTS_100("Memory.PluginProcessCount", plugin_count);
   UMA_HISTOGRAM_COUNTS_100("Memory.WorkerProcessCount", worker_count);
   // TODO(viettrungluu): Do we want separate counts for the other
   // (platform-specific) process types?
 
   int total_sample = static_cast<int>(aggregate_memory / 1000);
   UMA_HISTOGRAM_MEMORY_MB("Memory.Total", total_sample);
 }