Fix handling of BROWSER_WRAPPER in the test launcher.

content/public/test/test_launcher.cc

 // Copyright (c) 2012 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 "content/public/test/test_launcher.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 77 matching lines @@
   }
 
   CommandLine new_cmd_line(command_line);
 
   // Always enable disabled tests.  This method is not called with disabled
   // tests unless this flag was specified to the browser test executable.
   new_cmd_line.AppendSwitch("gtest_also_run_disabled_tests");
   new_cmd_line.AppendSwitchASCII("gtest_filter", test_name);
   new_cmd_line.AppendSwitch(kSingleProcessTestsFlag);
 
-  int exit_code = base::LaunchChildGTestProcess(new_cmd_line,
-                                                default_timeout,
-                                                was_timeout);
+  char* browser_wrapper = getenv("BROWSER_WRAPPER");
+  int exit_code = base::LaunchChildGTestProcess(
+      new_cmd_line,
+      browser_wrapper ? browser_wrapper : std::string(),
+      default_timeout,
+      was_timeout);
   if (*was_timeout) {
     LOG(ERROR) << "Test timeout (" << default_timeout.InMilliseconds()
                << " ms) exceeded for " << test_name;
   }
 
   return exit_code;
 }
 
 // Runs test specified by |test_name| in a child process,
 // and returns the exit code.
@@ skipping 12 matching lines @@
 #endif
 
   base::ScopedTempDir temp_dir;
   // Create a new data dir and pass it to the child.
   if (!temp_dir.CreateUniqueTempDir() || !temp_dir.IsValid()) {
     LOG(ERROR) << "Error creating temp data directory";
     return -1;
   }
 
   CommandLine new_cmd_line(*CommandLine::ForCurrentProcess());
-
-  const char* browser_wrapper = getenv("BROWSER_WRAPPER");
-  if (browser_wrapper) {
-#if defined(OS_WIN)
-    new_cmd_line.PrependWrapper(ASCIIToWide(browser_wrapper));
-#elif defined(OS_POSIX)
-    new_cmd_line.PrependWrapper(browser_wrapper);
-#endif
-    VLOG(1) << "BROWSER_WRAPPER was set, prefixing command_line with "
-            << browser_wrapper;
-  }
-
   if (!launcher_delegate->AdjustChildProcessCommandLine(&new_cmd_line,
                                                         temp_dir.path())) {
     return -1;
   }
 
   return DoRunTestInternal(
       test_case, test_name, new_cmd_line, default_timeout, was_timeout);
 }
 
 void PrintUsage() {
@@ skipping 197 matching lines @@
 
   WrapperTestLauncherDelegate delegate(launcher_delegate);
   return base::LaunchTests(&delegate, argc, argv);
 }
 
 TestLauncherDelegate* GetCurrentTestLauncherDelegate() {
   return g_launcher_delegate;
 }
 
 }  // namespace content