Add content_shell_test_apk and a several dependencies

content/content_tests.gypi

 # Copyright (c) 2013 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.
 
 {
   'variables': {
     'layouttest_support_content_sources': [
       'public/test/layouttest_support.h',
       'public/test/nested_message_pump_android.cc',
       'public/test/nested_message_pump_android.h',
@@ skipping 1335 matching lines @@
             }],
             ['enable_web_speech==0', {
               'sources/': [
                 ['exclude', '^browser/speech/'],
               ]
             }],
             ['branding=="Chrome"', {
               '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',
               ],
             }],
           ],
         },
         {
           'target_name': 'content_gl_tests',
           'type': '<(gtest_target_type)',
@@ skipping 177 matching lines @@
                 '../ui/gfx/x/gfx_x11.gyp:gfx_x11',
               ],
             }],
           ],
         },
       ]
     }],
     ['OS == "android"', {
       'targets': [
         {
+          # TODO(GN)
           'target_name': 'content_gl_tests_apk',
           'type': 'none',
           'dependencies': [
             'content_gl_tests',
             'content_java_test_support',
           ],
           'variables': {
             'test_suite_name': 'content_gl_tests',
           },
           'includes': [
             '../build/apk_test.gypi',
           ],
         },
         {
+          # TODO(GN)
           'target_name': 'content_unittests_apk',
           'type': 'none',
           'dependencies': [
             'content.gyp:content_java',
             'content_unittests',
           ],
           'variables': {
             'test_suite_name': 'content_unittests',
           },
           'includes': [ '../build/apk_test.gypi' ],
         },
         {
+          # TODO(GN)
           'target_name': 'content_browsertests_apk',
           'type': 'none',
           'dependencies': [
             'content.gyp:content_icudata',
             'content.gyp:content_java',
             'content_browsertests',
             'content_java_test_support',
             'content_shell_java',
           ],
           'variables': {
             'apk_name': 'content_browsertests',
             'java_in_dir': 'shell/android/browsertests_apk',
             'resource_dir': 'shell/android/browsertests_apk/res',
             'native_lib_target': 'libcontent_browsertests',
             'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/content_shell.pak'],
             'asset_location': '<(PRODUCT_DIR)/content_shell/assets',
             'conditions': [
               ['icu_use_data_file_flag==1', {
                 'additional_input_paths': [
                   '<(PRODUCT_DIR)/icudtl.dat',
                 ],
               }],
             ],
           },
           'includes': [ '../build/java_apk.gypi' ],
         },
         {
+          # TODO(GN)
           'target_name': 'content_perftests_apk',
           'type': 'none',
           'dependencies': [
             'content.gyp:content_java',
             'content_perftests',
           ],
           'variables': {
             'test_suite_name': 'content_perftests',
           },
           'includes': [ '../build/apk_test.gypi' ],
         },
         {
+          # TODO(GN)
           'target_name': 'chromium_linker_test_apk',
           'type': 'none',
           'conditions': [
             ['target_arch != "x64" and target_arch != "arm64"', {
               'dependencies': [
                 'chromium_android_linker_test',
                 'content.gyp:content_icudata',
                 'content.gyp:content_java',
                 'content_shell_java',
               ],
@@ skipping 13 matching lines @@
                     ],
                   }],
                 ],
               },
               'includes': [ '../build/java_apk.gypi' ],
             },
            ],
           ],
         },
         {
+          # TODO(GN)
           'target_name': 'chromium_android_linker_test',
           'type': 'shared_library',
           'defines!': ['CONTENT_IMPLEMENTATION'],
           'dependencies': [
             'chromium_android_linker_test_jni_headers',
             'content_shell_lib',
             # Required to include "content/public/browser/android/compositor.h"
             # in chromium_linker_test_android.cc :-(
             '../skia/skia.gyp:skia',
           ],
           'sources': [
             'shell/android/linker_test_apk/chromium_linker_test_android.cc',
             'shell/android/linker_test_apk/chromium_linker_test_linker_tests.cc',
           ],
         },
         {
+          # TODO(GN)
           'target_name': 'chromium_android_linker_test_jni_headers',
           'type': 'none',
           'sources': [
             'shell/android/linker_test_apk/src/org/chromium/chromium_linker_test_apk/LinkerTests.java',
           ],
           'variables': {
             'jni_gen_package': 'content/shell',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
         {
+          # TODO(GN)
           'target_name': 'video_decode_accelerator_unittest_apk',
           'type': 'none',
           'dependencies': [
             'video_decode_accelerator_unittest',
           ],
           'variables': {
             'test_suite_name': 'video_decode_accelerator_unittest',
           },
           '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': [
             'public/test/android/javatests/src/org/chromium/content/browser/test/NestedSystemMessageHandler.java',
           ],
           'variables': {
             'jni_gen_package': 'content/public/test',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
         {
+          # GN: //content/public/test/android:content_java_test_support
           'target_name': 'content_java_test_support',
           'type': 'none',
           'dependencies': [
             '../base/base.gyp:base',
             '../base/base.gyp:base_java_test_support',
             'content.gyp:content_common',
             'content.gyp:content_java',
           ],
           'variables': {
             'java_in_dir': '../content/public/test/android/javatests',
           },
           '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': [
             'content_java_test_support',
             'content_shell_apk_java',
             'content.gyp:content_java',
             '../base/base.gyp:base_java',
             '../base/base.gyp:base_javatests',
             '../base/base.gyp:base_java_test_support',
             '../media/media.gyp:media_java',
@@ skipping 152 matching lines @@
                   'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'],
                 },
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }