Reverting 30879.

chrome/test/test_launcher/out_of_proc_test_runner.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 <string>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/process_util.h"
 
@@ skipping 15 matching lines @@
   virtual ~OutOfProcTestRunner() {
   }
 
   bool Init() {
     return true;
   }
 
   // Returns true if the test succeeded, false if it failed.
   bool RunTest(const std::string& test_name) {
     const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
-#if defined(OS_WIN)
-    CommandLine new_cmd_line =
-        CommandLine::FromString(cmd_line->command_line_string());
-#else
     CommandLine new_cmd_line(cmd_line->argv());
-#endif
     // 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.AppendSwitchWithValue("gtest_filter", test_name);
     new_cmd_line.AppendSwitch(kChildProcessFlag);
 
     base::ProcessHandle process_handle;
     bool r = base::LaunchApp(new_cmd_line, false, false, &process_handle);
     if (!r)
       return false;
@@ skipping 30 matching lines @@
 
   if (command_line->HasSwitch(kChildProcessFlag))
     return ChromeTestSuite(argc, argv).Run();
 
   if (command_line->HasSwitch(kGTestListTestsFlag))
     return ChromeTestSuite(argc, argv).Run();
 
   OutOfProcTestRunnerFactory test_runner_factory;
   return tests::RunTests(test_runner_factory) ? 0 : 1;
 }