Enable components_browsertests on Android

components/test/android/browsertests_apk/components_browser_tests_android.cc

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2015 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 content browser tests
 // inside an android application.
 
 #include <android/log.h>
 #include <unistd.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/library_loader/library_loader_hooks.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/strings/string_tokenizer.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/test_launcher.h"
-#include "content/shell/android/shell_jni_registrar.h"
-#include "content/shell/app/shell_main_delegate.h"
-#include "jni/ContentBrowserTestsActivity_jni.h"
+#include "jni/ComponentsBrowserTestsActivity_jni.h"
 #include "media/base/media_switches.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::ScopedMainEntryLogger;
 
 // The main function of the program to be wrapped as an 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/content-browser-tests-command-line";
+    "/data/local/tmp/components-browser-tests-command-line";
 
 }  // namespace
 
-namespace content {
+namespace components {
 
-// TODO(nileshagrawal): Refactor and deduplicate with
-// testing/android/native_test_launcher.cc
+// TODO(jaekyun): Refactor and deduplicate with
+// testing/android/native_test/native_test_launcher.cc (http://crbug.com/476410)
 static void RunTests(JNIEnv* env,
                      jobject obj,
                      jstring jfiles_dir,
                      jobject app_context) {
   // Command line basic initialization, will be fully initialized later.
-  static const char* const kInitialArgv[] = { "ContentBrowserTestsActivity" };
+  static const char* const kInitialArgv[] = {"ComponentsBrowserTestsActivity"};
   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;
   ParseArgsFromCommandLineFile(kCommandLineFilePath, &args);
 
   std::vector<char*> argv;
   int argc = ArgsToArgv(args, &argv);
 
   // Fully initialize command line with arguments.
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   command_line->AppendArguments(base::CommandLine(argc, &argv[0]), false);
 
   // Append required switches.
   command_line->AppendSwitch(content::kSingleProcessTestsFlag);
   command_line->AppendSwitch(switches::kUseFakeDeviceForMediaStream);
   command_line->AppendSwitch(switches::kUseFakeUIForMediaStream);
   // Specify a socket name to not conflict with the default one used
   // in content_shell.
   command_line->AppendSwitchASCII(switches::kRemoteDebuggingSocketName,
-                                  "content_browsertests_devtools_remote");
+                                  "components_browsertests_devtools_remote");
 
   // Create fifo and redirect stdout and stderr to it.
   base::FilePath files_dir(
       base::android::ConvertJavaStringToUTF8(env, jfiles_dir));
   base::FilePath fifo_path(files_dir.Append(base::FilePath("test.fifo")));
   base::android::CreateFIFO(fifo_path, 0666);
   base::android::RedirectStream(stdout, fifo_path, "w+");
   dup2(STDOUT_FILENO, STDERR_FILENO);
 
   ScopedMainEntryLogger scoped_main_entry_logger;
   main(argc, &argv[0]);
 }
 
-bool RegisterContentBrowserTestsAndroid(JNIEnv* env) {
+bool RegisterComponentsBrowserTestsAndroid(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
-}  // namespace content
+}  // namespace components