[Android] Include NestedSystemMessageHandler in gn builds of content_shell_apk.

content/public/test/android/BUILD.gn

Index: content/public/test/android/BUILD.gn
diff --git a/content/public/test/android/BUILD.gn b/content/public/test/android/BUILD.gn
index e1a6e6ff9a8820eee7261b2e78032fee6a80abfa..7b3fe2619bddc73c9867b21ca2723bb60a122eb4 100644
--- a/content/public/test/android/BUILD.gn
+++ b/content/public/test/android/BUILD.gn
@@ -9,16 +9,24 @@ generate_jni("test_support_content_jni_headers") {
   ]
 }
 
+android_library("layouttest_java_support") {
+  deps = [

[agrieve, 2016/04/26 14:31:34]

testonly?

[jbudorick, 2016/04/26 14:33:05]

I guess it could be. I intentionally left it off because I assumed that
content_shell_apk isn't testonly, but it is.

+    "//base:base_java",
+  ]
+  java_files = [ "javatests/src/org/chromium/content/browser/test/NestedSystemMessageHandler.java" ]
+}
+
 # GYP: //content/content_tests.gypi:content_java_test_support
 android_library("content_java_test_support") {
+  testonly = true
   deps = [
+    ":layouttest_java_support",
     "//base:base_java",
     "//base:base_java_test_support",
     "//content/public/android:content_java",
   ]
   java_files = [
     "javatests/src/org/chromium/content/browser/test/NativeLibraryTestBase.java",
-    "javatests/src/org/chromium/content/browser/test/NestedSystemMessageHandler.java",
     "javatests/src/org/chromium/content/browser/test/util/ApplicationUtils.java",
     "javatests/src/org/chromium/content/browser/test/util/CallbackHelper.java",
     "javatests/src/org/chromium/content/browser/test/util/Criteria.java",