Enable components_browsertests on Android

components/test/android/browsertests_apk/components_browser_tests_android.cc

Index: components/test/android/browsertests_apk/components_browser_tests_android.cc
diff --git a/content/shell/android/browsertests_apk/content_browser_tests_android.cc b/components/test/android/browsertests_apk/components_browser_tests_android.cc
similarity index 83%
copy from content/shell/android/browsertests_apk/content_browser_tests_android.cc
copy to components/test/android/browsertests_apk/components_browser_tests_android.cc
index 86f43b50025f10fd5d5078a69add4a68fc83282e..baf8efe457a72ac8078fdce840b37927476a3e48 100644
--- a/content/shell/android/browsertests_apk/content_browser_tests_android.cc
+++ b/components/test/android/browsertests_apk/components_browser_tests_android.cc
@@ -1,4 +1,4 @@
-// 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.
 
@@ -23,9 +23,7 @@
 #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"
 
@@ -41,20 +39,20 @@ 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.
@@ -80,7 +78,7 @@ static void RunTests(JNIEnv* env,
   // 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(
@@ -94,8 +92,8 @@ static void RunTests(JNIEnv* env,
   main(argc, &argv[0]);
 }
 
-bool RegisterContentBrowserTestsAndroid(JNIEnv* env) {
+bool RegisterComponentsBrowserTestsAndroid(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
-}  // namespace content
+}  // namespace components