Compile content_gl_tests on Android

content/content_tests.gypi

Index: content/content_tests.gypi
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index f7f595156e16e9392ebc051d0fd6f6c9182c653d..ebe38906b3f5cbc537100cf58742bd11120c6e6d 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -243,6 +243,7 @@
         }],
         ['OS=="android"', {
           'dependencies': [
+            '../ui/ui.gyp:shell_dialogs',
             'test_support_content_jni_headers',
           ],
         }],
@@ -705,9 +706,6 @@
           ],
         }],
         ['OS == "android"', {
-          'dependencies': [
-            '../ui/ui.gyp:shell_dialogs',
-          ],
           'sources!': [
             'browser/geolocation/gps_location_provider_unittest_linux.cc',
             'browser/geolocation/network_location_provider_unittest.cc',
@@ -1015,6 +1013,13 @@
             'common/gpu/client/gl_helper_unittests.cc',
             'common/gpu/client/gpu_in_process_context_tests.cc',
           ],
+          'conditions': [
+            ['OS=="android"', {
+              'dependencies': [
+                '../testing/android/native_test.gyp:native_test_native_code',
+              ],
+            }],
+          ],
         },
         {
           'target_name': 'content_gl_benchmark',
@@ -1150,6 +1155,21 @@
     ['OS == "android" and gtest_target_type == "shared_library"', {
       'targets': [
         {
+          'target_name': 'content_gl_tests_apk',
+          'type': 'none',
+          'dependencies': [
+            'content_gl_tests',
+            'content_java_test_support',
+          ],
+          'variables': {
+            'test_suite_name': 'content_gl_tests',
+            'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)content_gl_tests<(SHARED_LIB_SUFFIX)',
+          },
+          'includes': [
+            '../build/apk_test.gypi',
+          ],
+        },
+        {
           'target_name': 'content_unittests_apk',
           'type': 'none',
           'dependencies': [