Better code to determine the framework and helper app paths

chrome/common/child_process_host.cc

 // 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/common/child_process_host.h"
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/logging.h"
@@ skipping 67 matching lines @@
   Singleton<ChildProcessList>::get()->remove(this);
 
   resource_dispatcher_host_->CancelRequestsForProcess(id());
 
   if (handle())
     ProcessWatcher::EnsureProcessTerminated(handle());
 }
 
 // static
 FilePath ChildProcessHost::GetChildPath() {
-  static FilePath child_path;
-
-  if (!child_path.empty())
-    return child_path;
+  FilePath child_path;
 
   child_path = CommandLine::ForCurrentProcess()->GetSwitchValuePath(
       switches::kBrowserSubprocessPath);
   if (!child_path.empty())
     return child_path;
 
 #if !defined(OS_MACOSX)
   // On most platforms, the child executable is the same as the current
   // executable.
   PathService::Get(base::FILE_EXE, &child_path);
 #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;
 }
 
 // static
 void ChildProcessHost::SetCrashReporterCommandLine(CommandLine* command_line) {
 #if defined(USE_LINUX_BREAKPAD)
   const bool unattended = (getenv("CHROME_HEADLESS") != NULL);
   if (unattended || GoogleUpdateSettings::GetCollectStatsConsent()) {
@@ skipping 155 matching lines @@
 
     return *iterator_;
   } while (true);
 
   return NULL;
 }
 
 bool ChildProcessHost::Iterator::Done() {
   return iterator_ == Singleton<ChildProcessList>::get()->end();
 }