Re-commit r22981 after backout at r22992

chrome/browser/plugin_process_host.cc

Index: chrome/browser/plugin_process_host.cc
===================================================================
--- chrome/browser/plugin_process_host.cc	(revision 22996)
+++ chrome/browser/plugin_process_host.cc	(working copy)
@@ -335,11 +335,10 @@
 
   // build command line for plugin, we have to quote the plugin's path to deal
   // with spaces.
-  const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess();
-  std::wstring exe_path =
-      browser_command_line.GetSwitchValue(switches::kBrowserSubprocessPath);
-  if (exe_path.empty() && !PathService::Get(base::FILE_EXE, &exe_path))
+  std::wstring exe_path = GetChildPath();
+  if (exe_path.empty()) {
     return false;
+  }
 
   CommandLine cmd_line(exe_path);
   if (logging::DialogsAreSuppressed())
@@ -368,6 +367,8 @@
     switches::kEnableStatsTable,
   };
 
+  const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess();
+
   for (size_t i = 0; i < arraysize(switch_names); ++i) {
     if (browser_command_line.HasSwitch(switch_names[i])) {
       cmd_line.AppendSwitchWithValue(