| Index: testing/android/native_test_launcher.cc
 | 
| diff --git a/testing/android/native_test_launcher.cc b/testing/android/native_test_launcher.cc
 | 
| deleted file mode 100644
 | 
| index 4cc87d211c3bb172e260f2dd820fee81477462b1..0000000000000000000000000000000000000000
 | 
| --- a/testing/android/native_test_launcher.cc
 | 
| +++ /dev/null
 | 
| @@ -1,161 +0,0 @@
 | 
| -// 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.
 | 
| -
 | 
| -#include <android/log.h>
 | 
| -#include <signal.h>
 | 
| -
 | 
| -#include "base/android/base_jni_registrar.h"
 | 
| -#include "base/android/fifo_utils.h"
 | 
| -#include "base/android/jni_android.h"
 | 
| -#include "base/android/jni_string.h"
 | 
| -#include "base/android/scoped_java_ref.h"
 | 
| -#include "base/at_exit.h"
 | 
| -#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/ChromeNativeTestActivity_jni.h"
 | 
| -#include "testing/android/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 {
 | 
| -
 | 
| -// 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";
 | 
| -
 | 
| -// The list of signals which are considered to be crashes.
 | 
| -const int kExceptionSignals[] = {
 | 
| -  SIGSEGV, SIGABRT, SIGFPE, SIGILL, SIGBUS, -1
 | 
| -};
 | 
| -
 | 
| -struct sigaction g_old_sa[NSIG];
 | 
| -
 | 
| -// This function runs in a compromised context. It should not allocate memory.
 | 
| -void SignalHandler(int sig, siginfo_t* info, void* reserved) {
 | 
| -  // Output the crash marker.
 | 
| -  write(STDOUT_FILENO, kCrashedMarker, sizeof(kCrashedMarker));
 | 
| -  g_old_sa[sig].sa_sigaction(sig, info, reserved);
 | 
| -}
 | 
| -
 | 
| -// Writes printf() style string to Android's logger where |priority| is one of
 | 
| -// the levels defined in <android/log.h>.
 | 
| -void AndroidLog(int priority, const char* format, ...) {
 | 
| -  va_list args;
 | 
| -  va_start(args, format);
 | 
| -  __android_log_vprint(priority, kLogTag, format, args);
 | 
| -  va_end(args);
 | 
| -}
 | 
| -
 | 
| -}  // namespace
 | 
| -
 | 
| -static void RunTests(JNIEnv* env,
 | 
| -                     jobject obj,
 | 
| -                     jstring jcommand_line_flags,
 | 
| -                     jstring jcommand_line_file_path,
 | 
| -                     jstring jstdout_file_path,
 | 
| -                     jboolean jstdout_fifo,
 | 
| -                     jobject app_context) {
 | 
| -  // Command line initialized basically, will be fully initialized later.
 | 
| -  static const char* const kInitialArgv[] = { "ChromeTestActivity" };
 | 
| -  base::CommandLine::Init(arraysize(kInitialArgv), kInitialArgv);
 | 
| -
 | 
| -  // Set the application context in base.
 | 
| -  base::android::ScopedJavaLocalRef<jobject> scoped_context(
 | 
| -      env, env->NewLocalRef(app_context));
 | 
| -  base::android::InitApplicationContext(env, scoped_context);
 | 
| -  base::android::RegisterJni(env);
 | 
| -
 | 
| -  std::vector<std::string> args;
 | 
| -
 | 
| -  const std::string command_line_file_path(
 | 
| -      base::android::ConvertJavaStringToUTF8(env, jcommand_line_file_path));
 | 
| -  if (command_line_file_path.empty())
 | 
| -    ParseArgsFromCommandLineFile(kCommandLineFilePath, &args);
 | 
| -  else
 | 
| -    ParseArgsFromCommandLineFile(command_line_file_path.c_str(), &args);
 | 
| -
 | 
| -  const std::string command_line_flags(
 | 
| -      base::android::ConvertJavaStringToUTF8(env, jcommand_line_flags));
 | 
| -  ParseArgsFromString(command_line_flags, &args);
 | 
| -
 | 
| -  std::vector<char*> argv;
 | 
| -  int argc = ArgsToArgv(args, &argv);
 | 
| -
 | 
| -  // Fully initialize command line with arguments.
 | 
| -  base::CommandLine::ForCurrentProcess()->AppendArguments(
 | 
| -      base::CommandLine(argc, &argv[0]), false);
 | 
| -  const base::CommandLine& command_line =
 | 
| -      *base::CommandLine::ForCurrentProcess();
 | 
| -
 | 
| -  base::FilePath stdout_file_path(
 | 
| -      base::android::ConvertJavaStringToUTF8(env, jstdout_file_path));
 | 
| -
 | 
| -  // 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")) {
 | 
| -    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]]);
 | 
| -  }
 | 
| -}
 | 
| 
 |