Convert a couple of wstring methods in ChildProcessInfo.

(The underlying data still needs to be converted.)

BUG=23581
TEST=builds and passes tests

Review URL: http://codereview.chromium.org/3133023

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56628 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 5 insertions, 6 deletions

diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc
index b841434..1f00aee 100644
--- a/chrome/browser/automation/automation_provider.cc
+++ b/chrome/browser/automation/automation_provider.cc
@@ -1850,8 +1850,7 @@ class GetChildProcessHostInfoTask : public Task {
       DictionaryValue* item = new DictionaryValue;
       item->SetString("name", WideToUTF16Hack(info->name()));
       item->SetString("type",
-                      WideToUTF16Hack(ChildProcessInfo::GetTypeNameInEnglish(
-                          info->type())));
+                      ChildProcessInfo::GetTypeNameInEnglish(info->type()));
       item->SetInteger("pid", base::GetProcId(info->handle()));
       child_processes_->Append(item);
     }
diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc
index 6d0765f..381f7be 100644
--- a/chrome/browser/browser_about_handler.cc
+++ b/chrome/browser/browser_about_handler.cc
@@ -945,10 +945,10 @@ void AboutMemoryHandler::AppendProcess(ListValue* child_data,
   child_data->Append(child);
   BindProcessMetrics(child, info);
 
-  std::wstring child_label(ChildProcessInfo::GetTypeNameInEnglish(info->type));
+  std::string child_label(ChildProcessInfo::GetTypeNameInEnglish(info->type));
   if (info->is_diagnostics)
-    child_label.append(L" (diagnostics)");
-  child->SetString("child_name", WideToUTF16Hack(child_label));
+    child_label.append(" (diagnostics)");
+  child->SetString("child_name", child_label);
   ListValue* titles = new ListValue();
   child->Set("titles", titles);
   for (size_t i = 0; i < info->titles.size(); ++i)
diff --git a/chrome/browser/task_manager_resource_providers.cc b/chrome/browser/task_manager_resource_providers.cc
index a9066c8..2b41233 100644
--- a/chrome/browser/task_manager_resource_providers.cc
+++ b/chrome/browser/task_manager_resource_providers.cc
@@ -341,7 +341,7 @@ TaskManagerChildProcessResource::~TaskManagerChildProcessResource() {
 // TaskManagerResource methods:
 std::wstring TaskManagerChildProcessResource::GetTitle() const {
   if (title_.empty())
-    title_ = child_process_.GetLocalizedTitle();
+    title_ = UTF16ToWideHack(child_process_.GetLocalizedTitle());
 
   return title_;
 }