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 87%
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 d73ea6feec7fba769f62780093b6796d6c5bad42..8333c6a3a6768961e33a3ca2b9008a1b5388de80 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 (c) 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_util.h"
 
@@ -41,11 +39,11 @@ 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

[jbudorick, 2015/04/10 13:34:32]

I really don't like adding a third (!) native test APK wrapper.

[Ted C, 2015/04/10 16:42:43]

FWIW, this code looks easily shareable to be as all the params could be passed
in from java.

But I don't know if that is what you're disliking in this context.

[Jaekyun Seok (inactive), 2015/04/13 01:36:02]

I filed http://crbug/476410 to follow up this later.

 // testing/android/native_test_launcher.cc
@@ -54,7 +52,7 @@ static void RunTests(JNIEnv* env,
                      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.
@@ -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