Fix issue 11006 - any plugin process started by InProcessBrowserTest was...

chrome/test/in_process_browser_test.cc

 // Copyright (c) 2006-2008 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/test/in_process_browser_test.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ skipping 93 matching lines @@
   // For some reason the sandbox wasn't happy running in test mode. These
   // tests aren't intended to test the sandbox, so we turn it off.
   command_line->AppendSwitch(switches::kNoSandbox);
 
   // Single-process mode is not set in BrowserMain so it needs to be processed
   // explicitlty.
   original_single_process_ = RenderProcessHost::run_renderer_in_process();
   if (command_line->HasSwitch(switches::kSingleProcess))
     RenderProcessHost::set_run_renderer_in_process(true);
 
-  // Explicitly set the path of the exe used for the renderer, otherwise it'll
-  // try to use unit_test.exe.
-  std::wstring renderer_path;
-  PathService::Get(base::FILE_EXE, &renderer_path);
-  FilePath fp_renderer_path = FilePath::FromWStringHack(renderer_path);
-  renderer_path = fp_renderer_path.DirName().ToWStringHack();
-  file_util::AppendToPath(&renderer_path,
+  // Explicitly set the path of the exe used for the renderer and plugin,
+  // otherwise they'll try to use unit_test.exe.
+  std::wstring subprocess_path;
+  PathService::Get(base::FILE_EXE, &subprocess_path);
+  FilePath fp_subprocess_path = FilePath::FromWStringHack(subprocess_path);
+  subprocess_path = fp_subprocess_path.DirName().ToWStringHack();
+  file_util::AppendToPath(&subprocess_path,
                           chrome::kBrowserProcessExecutablePath);
-  command_line->AppendSwitchWithValue(switches::kRendererPath, renderer_path);
+  command_line->AppendSwitchWithValue(switches::kBrowserSubprocessPath,
+                                      subprocess_path);
 
   sandbox::SandboxInterfaceInfo sandbox_info = {0};
   SandboxInitWrapper sandbox_wrapper;
   MainFunctionParams params(*command_line, sandbox_wrapper, NULL);
   params.ui_task =
       NewRunnableMethod(this, &InProcessBrowserTest::RunTestOnMainThreadLoop);
 
   scoped_refptr<net::RuleBasedHostMapper> host_mapper(
       new net::RuleBasedHostMapper());
   ConfigureHostMapper(host_mapper.get());
@@ skipping 88 matching lines @@
   MessageLoopForUI::current()->Quit();
 }
 
 void InProcessBrowserTest::ConfigureHostMapper(
     net::RuleBasedHostMapper* host_mapper) {
   host_mapper->AllowDirectLookup("*.google.com");
   // See http://en.wikipedia.org/wiki/Web_Proxy_Autodiscovery_Protocol
   // We don't want the test code to use it.
   host_mapper->AddSimulatedFailure("wpad");
 }