Use FilePath in ChildProcessHost.

BUG=24672
TEST=still compiles

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

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

6 files changed, 9 insertions, 10 deletions

diff --git a/chrome/browser/plugin_process_host.cc b/chrome/browser/plugin_process_host.cc
index 525e640..1fe75af 100644
--- a/chrome/browser/plugin_process_host.cc
+++ b/chrome/browser/plugin_process_host.cc
@@ -357,10 +357,9 @@ bool PluginProcessHost::Init(const WebPluginInfo& info,
 
   // Build command line for plugin, we have to quote the plugin's path to deal
   // with spaces.
-  std::wstring exe_path = GetChildPath();
-  if (exe_path.empty()) {
+  FilePath exe_path = GetChildPath();
+  if (exe_path.empty())
     return false;
-  }
 
   CommandLine cmd_line(exe_path);
   // Put the process type and plugin path first so they're easier to see
diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc
index b43b878..2d55eca 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.cc
+++ b/chrome/browser/renderer_host/browser_render_process_host.cc
@@ -268,7 +268,7 @@ bool BrowserRenderProcessHost::Init() {
 
   // Find the renderer before creating the channel so if this fails early we
   // return without creating the channel.
-  std::wstring renderer_path = ChildProcessHost::GetChildPath();
+  FilePath renderer_path = ChildProcessHost::GetChildPath();
   if (renderer_path.empty())
     return false;
 
diff --git a/chrome/browser/utility_process_host.cc b/chrome/browser/utility_process_host.cc
index 246e7ff..0e44688 100644
--- a/chrome/browser/utility_process_host.cc
+++ b/chrome/browser/utility_process_host.cc
@@ -59,7 +59,7 @@ bool UtilityProcessHost::StartUpdateManifestParse(const std::string& xml) {
   return true;
 }
 
-std::wstring UtilityProcessHost::GetUtilityProcessCmd() {
+FilePath UtilityProcessHost::GetUtilityProcessCmd() {
   return GetChildPath();
 }
 
@@ -78,7 +78,7 @@ bool UtilityProcessHost::StartProcess(const FilePath& exposed_dir) {
   if (!CreateChannel())
     return false;
 
-  std::wstring exe_path = GetUtilityProcessCmd();
+  FilePath exe_path = GetUtilityProcessCmd();
   if (exe_path.empty()) {
     NOTREACHED() << "Unable to get utility process binary name.";
     return false;
diff --git a/chrome/browser/utility_process_host.h b/chrome/browser/utility_process_host.h
index fa0a63c..d9e6d3f 100644
--- a/chrome/browser/utility_process_host.h
+++ b/chrome/browser/utility_process_host.h
@@ -94,7 +94,7 @@ class UtilityProcessHost : public ChildProcessHost {
 
  protected:
   // Allow these methods to be overridden for tests.
-  virtual std::wstring GetUtilityProcessCmd();
+  virtual FilePath GetUtilityProcessCmd();
   virtual bool UseSandbox() {
     return true;
   }
diff --git a/chrome/browser/utility_process_host_unittest.cc b/chrome/browser/utility_process_host_unittest.cc
index 8874719..f901a9a 100644
--- a/chrome/browser/utility_process_host_unittest.cc
+++ b/chrome/browser/utility_process_host_unittest.cc
@@ -76,12 +76,12 @@ class TestUtilityProcessHost : public UtilityProcessHost {
   }
 
  protected:
-  virtual std::wstring GetUtilityProcessCmd() {
+  virtual FilePath GetUtilityProcessCmd() {
     FilePath exe_path;
     PathService::Get(base::DIR_EXE, &exe_path);
     exe_path = exe_path.AppendASCII(WideToASCII(
         chrome::kHelperProcessExecutablePath));
-    return exe_path.ToWStringHack();
+    return exe_path;
   }
 
   virtual bool UseSandbox() {
diff --git a/chrome/browser/worker_host/worker_process_host.cc b/chrome/browser/worker_host/worker_process_host.cc
index b05df3b..094a2fd 100644
--- a/chrome/browser/worker_host/worker_process_host.cc
+++ b/chrome/browser/worker_host/worker_process_host.cc
@@ -90,7 +90,7 @@ bool WorkerProcessHost::Init() {
   if (!CreateChannel())
     return false;
 
-  std::wstring exe_path = GetChildPath();
+  FilePath exe_path = GetChildPath();
   if (exe_path.empty())
     return false;