Better code to determine the framework and helper app paths

chrome/common/child_process_host.cc

Index: chrome/common/child_process_host.cc
===================================================================
--- chrome/common/child_process_host.cc	(revision 28987)
+++ chrome/common/child_process_host.cc	(working copy)
@@ -85,11 +85,8 @@
 
 // static
 FilePath ChildProcessHost::GetChildPath() {
-  static FilePath child_path;
+  FilePath child_path;
 
-  if (!child_path.empty())
-    return child_path;
-
   child_path = CommandLine::ForCurrentProcess()->GetSwitchValuePath(
       switches::kBrowserSubprocessPath);
   if (!child_path.empty())
@@ -102,8 +99,8 @@
 #else
   // On the Mac, the child executable lives at a predefined location within
   // the app bundle's versioned directory.
-  child_path = chrome::GetVersionedDirectory().Append(
-      FilePath::FromWStringHack(chrome::kHelperProcessExecutablePath));
+  child_path = chrome::GetVersionedDirectory().
+      Append(chrome::kHelperProcessExecutablePath);
 #endif  // OS_MACOSX
 
   return child_path;