Revert of [Android] Refactor the native test wrappers.

testing/android/native_test/native_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.
 
 // This class sets up the environment for running the native tests inside an
 // android application. It outputs (to a fifo) markers identifying the
 // START/PASSED/CRASH of the test suite, FAILURE/SUCCESS of individual tests,
 // etc.
 // These markers are read by the test runner script to generate test results.
 // It installs signal handlers to detect crashes.
@@ skipping 10 matching lines @@
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "gtest/gtest.h"
 #include "jni/NativeTestActivity_jni.h"
 #include "testing/android/native_test/native_test_util.h"
 
+using testing::native_test_util::ArgsToArgv;
+using testing::native_test_util::ParseArgsFromCommandLineFile;
+using testing::native_test_util::ParseArgsFromString;
+using testing::native_test_util::ScopedMainEntryLogger;
+
 // The main function of the program to be wrapped as a test apk.
 extern int main(int argc, char** argv);
 
-namespace testing {
-namespace android {
-
 namespace {
 
 // The test runner script writes the command line file in
 // "/data/local/tmp".
 static const char kCommandLineFilePath[] =
     "/data/local/tmp/chrome-native-tests-command-line";
 
 const char kLogTag[] = "chromium";
 const char kCrashedMarker[] = "[ CRASHED      ]\n";
 
@@ skipping 67 matching lines @@
   // A few options, such "--gtest_list_tests", will just use printf directly
   // Always redirect stdout to a known file.
   unlink(stdout_file_path.value().c_str());
   if (jstdout_fifo) {
     if (!base::android::CreateFIFO(stdout_file_path, 0666)) {
       AndroidLog(ANDROID_LOG_ERROR, "Failed to create fifo %s: %s\n",
                  stdout_file_path.value().c_str(), strerror(errno));
       exit(EXIT_FAILURE);
     }
   }
-  if (!base::android::RedirectStream(stdout, stdout_file_path, "w+")) {
+  if (!base::android::RedirectStream(stdout, stdout_file_path, "w")) {
     AndroidLog(ANDROID_LOG_ERROR, "Failed to redirect stream to file: %s: %s\n",
                stdout_file_path.value().c_str(), strerror(errno));
     exit(EXIT_FAILURE);
   }
   dup2(STDOUT_FILENO, STDERR_FILENO);
 
   if (command_line.HasSwitch(switches::kWaitForDebugger)) {
     AndroidLog(ANDROID_LOG_VERBOSE,
                "Native test waiting for GDB because flag %s was supplied",
                switches::kWaitForDebugger);
     base::debug::WaitForDebugger(24 * 60 * 60, false);
   }
 
   ScopedMainEntryLogger scoped_main_entry_logger;
   main(argc, &argv[0]);
 }
 
 bool RegisterNativeTestJNI(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
+
 // TODO(nileshagrawal): now that we're using FIFO, test scripts can detect EOF.
 // Remove the signal handlers.
 void InstallHandlers() {
   struct sigaction sa;
   memset(&sa, 0, sizeof(sa));
 
   sa.sa_sigaction = SignalHandler;
   sa.sa_flags = SA_SIGINFO;
 
   for (unsigned int i = 0; kExceptionSignals[i] != -1; ++i) {
     sigaction(kExceptionSignals[i], &sa, &g_old_sa[kExceptionSignals[i]]);
   }
 }
-
-}  // namespace android
-}  // namespace testing