Run shell tests on android.

shell/BUILD.gn

Index: shell/BUILD.gn
diff --git a/shell/BUILD.gn b/shell/BUILD.gn
index 5684c80668fafbb4780f687362a0f35bf4293778..240fa892a1388603bccdd517698317f44f2756c2 100644
--- a/shell/BUILD.gn
+++ b/shell/BUILD.gn
@@ -23,7 +23,10 @@ group("shell") {
   }
 
   if (is_android) {
-    deps += [ ":mojo_shell_apk" ]
+    deps += [
+      ":mojo_shell_apk",
+      ":mojo_shell_tests_apk",
+    ]
   }
 }
 
@@ -230,6 +233,7 @@ if (is_android) {
       "android/apk/src/org/chromium/mojo/shell/AndroidHandler.java",
       "android/apk/src/org/chromium/mojo/shell/Bootstrap.java",
       "android/apk/src/org/chromium/mojo/shell/MojoMain.java",
+      "android/tests/src/org/chromium/mojo/shell/ShellTestBase.java",
     ]
     jni_package = "mojo/shell"
   }
@@ -287,6 +291,7 @@ if (is_android) {
   }
 
   mojo_shell_assets_dir = "$root_build_dir/mojo_shell_assets"
+  mojo_shell_test_assets_dir = "$root_build_dir/mojo_shell_test_assets"
 
   copy_ex("copy_mojo_shell_assets") {
     clear_dir = true
@@ -307,6 +312,15 @@ if (is_android) {
     ]
   }
 
+  copy_ex("copy_mojo_shell_test_assets") {
+    clear_dir = true
+    dest = mojo_shell_test_assets_dir
+    sources = [
+      "$root_out_dir/test_app.mojo",
+      "$root_out_dir/test_request_tracker_app.mojo",
+    ]
+  }
+
   android_apk("mojo_shell_apk") {
     apk_name = "MojoShell"
 
@@ -324,6 +338,28 @@ if (is_android) {
       "//services/native_viewport:native_viewport_java",
     ]
   }
+
+  android_library("mojo_shell_tests_java") {
+    java_files =
+        [ "android/tests/src/org/chromium/mojo/shell/ShellTestBase.java" ]
+
+    deps = [
+      ":java",
+      "//base:base_java",
+    ]
+  }
+
+  unittest_apk("mojo_shell_tests_apk") {
+    unittests_dep = ":mojo_shell_tests"
+
+    asset_location = mojo_shell_test_assets_dir
+
+    deps = [
+      unittests_dep,
+      ":copy_mojo_shell_test_assets",
+      ":mojo_shell_tests_java",
+    ]
+  }
 }
 
 mojom("app_child_process_bindings") {
@@ -374,6 +410,7 @@ test("mojo_shell_tests") {
     "in_process_dynamic_service_runner_unittest.cc",
     "mojo_url_resolver_unittest.cc",
     "shell_test_base.cc",
+    "shell_test_base_android.cc",
     "shell_test_base.h",
     "shell_test_base_unittest.cc",
     "shell_test_main.cc",
@@ -405,8 +442,8 @@ test("mojo_shell_tests") {
     sources += [ "android/background_application_loader_unittest.cc" ]
 
     deps += [
-      # TODO(GYP):
-      #'../testing/android/native_test.gyp:native_test_native_code',
+      ":jni_headers",
+      "//testing/android:native_test_native_code",
     ]
   }
 }