Fix handling of BROWSER_WRAPPER in the test launcher.

base/test/test_launcher.cc

 // Copyright 2013 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 "base/test/test_launcher.h"
 
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/environment.h"
@@ skipping 332 matching lines @@
 
 const char kHelpFlag[]   = "help";
 
 TestResult::TestResult() {
 }
 
 TestLauncherDelegate::~TestLauncherDelegate() {
 }
 
 int LaunchChildGTestProcess(const CommandLine& command_line,
+                            const std::string& wrapper,

[zhaoqin, 2013/06/26 19:03:28]

shall we add comment somewhere to indicate why we must pass wrapper instead of
calling PrependWrapper at caller.

[Paweł Hajdan Jr., 2013/06/26 19:59:49]

Done.

                             base::TimeDelta timeout,
                             bool* was_timeout) {
   CommandLine new_command_line(command_line.GetProgram());
   CommandLine::SwitchMap switches = command_line.GetSwitches();
 
   // Strip out gtest_output flag because otherwise we would overwrite results
   // of the other tests.
   switches.erase(kGTestOutputFlag);
 
   // Strip out gtest_repeat flag - this is handled by the launcher process.
   switches.erase(kGTestRepeatFlag);
 
   for (CommandLine::SwitchMap::const_iterator iter = switches.begin();
        iter != switches.end(); ++iter) {
     new_command_line.AppendSwitchNative((*iter).first, (*iter).second);
   }
 
+#if defined(OS_WIN)
+  new_command_line.PrependWrapper(ASCIIToWide(wrapper));

[zhaoqin, 2013/06/26 19:03:28]

src\base\test\test_launcher.cc(372) : error C3861: 'ASCIIToWide': identifier not
found

[Paweł Hajdan Jr., 2013/06/26 19:59:49]

Done.

+#elif defined(OS_POSIX)
+  new_command_line.PrependWrapper(wrapper);
+#endif
+

[zhaoqin, 2013/06/26 19:03:28]

shall we move the VLOG here too?

[Paweł Hajdan Jr., 2013/06/26 19:59:49]

IMHO not worth it. I'm happy to change though if anybody has a strong opinion.

   base::ProcessHandle process_handle;
   base::LaunchOptions options;
 
 #if defined(OS_POSIX)
   // On POSIX, we launch the test in a new process group with pgid equal to
   // its pid. Any child processes that the test may create will inherit the
   // same pgid. This way, if the test is abruptly terminated, we can clean up
   // any orphaned child processes it may have left behind.
   options.new_process_group = true;
 #endif
@@ skipping 49 matching lines @@
 
     // Special value "-1" means "repeat indefinitely".
     if (cycles != -1)
       cycles--;
   }
 
   return exit_code;
 }
 
 }  // namespace base