Add content_shell_test_apk and a several dependencies

content/content_tests.gypi

Index: content/content_tests.gypi
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 2b928e8372684f259a30d4e7c8c2c03b791ae14c..74f0ca8463847b009bdfbe4cf992ff9bd3dac958 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -1353,7 +1353,7 @@
               'sources!': [
                 # These tests depend on single process mode, which is disabled
                 # in official builds.
-    'renderer/browser_render_view_browsertest.cc',
+                'renderer/browser_render_view_browsertest.cc',
                 'renderer/dom_serializer_browsertest.cc',
                 'renderer/resource_fetcher_browsertest.cc',
                 'renderer/savable_resources_browsertest.cc',
@@ -1551,6 +1551,7 @@
     ['OS == "android"', {
       'targets': [
         {
+          # TODO(GN)
           'target_name': 'content_gl_tests_apk',
           'type': 'none',
           'dependencies': [
@@ -1565,6 +1566,7 @@
           ],
         },
         {
+          # TODO(GN)
           'target_name': 'content_unittests_apk',
           'type': 'none',
           'dependencies': [
@@ -1577,6 +1579,7 @@
           'includes': [ '../build/apk_test.gypi' ],
         },
         {
+          # TODO(GN)
           'target_name': 'content_browsertests_apk',
           'type': 'none',
           'dependencies': [
@@ -1604,6 +1607,7 @@
           'includes': [ '../build/java_apk.gypi' ],
         },
         {
+          # TODO(GN)
           'target_name': 'content_perftests_apk',
           'type': 'none',
           'dependencies': [
@@ -1616,6 +1620,7 @@
           'includes': [ '../build/apk_test.gypi' ],
         },
         {
+          # TODO(GN)
           'target_name': 'chromium_linker_test_apk',
           'type': 'none',
           'conditions': [
@@ -1649,6 +1654,7 @@
           ],
         },
         {
+          # TODO(GN)
           'target_name': 'chromium_android_linker_test',
           'type': 'shared_library',
           'defines!': ['CONTENT_IMPLEMENTATION'],
@@ -1665,6 +1671,7 @@
           ],
         },
         {
+          # TODO(GN)
           'target_name': 'chromium_android_linker_test_jni_headers',
           'type': 'none',
           'sources': [
@@ -1676,6 +1683,7 @@
           'includes': [ '../build/jni_generator.gypi' ],
         },
         {
+          # TODO(GN)
           'target_name': 'video_decode_accelerator_unittest_apk',
           'type': 'none',
           'dependencies': [
@@ -1686,11 +1694,8 @@
           },
           'includes': [ '../build/apk_test.gypi' ],
         },
-      ],
-    }],
-    ['OS == "android"', {
-      'targets': [
         {
+          # GN: //content/public/test/android:test_support_content_jni_headers
           'target_name': 'test_support_content_jni_headers',
           'type': 'none',
           'sources': [
@@ -1702,6 +1707,7 @@
           'includes': [ '../build/jni_generator.gypi' ],
         },
         {
+          # GN: //content/public/test/android:content_java_test_support
           'target_name': 'content_java_test_support',
           'type': 'none',
           'dependencies': [
@@ -1716,6 +1722,8 @@
           'includes': [ '../build/java.gypi' ],
         },
         {
+          # GN: //content/shell/android:content_shell_test_apk
+          #     and //content/public/android:content_javatests
           'target_name': 'content_shell_test_apk',
           'type': 'none',
           'dependencies': [