Android: cleanup gtest_target_type conditions.

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.
 
 {
   'targets': [
     {
       'target_name': 'layouttest_support_content',
       'type': 'static_library',
       'conditions': [
@@ skipping 860 matching lines @@
             'browser/geolocation/wifi_data_provider_chromeos_unittest.cc',
             'browser/geolocation/wifi_data_provider_common_unittest.cc',
             'browser/geolocation/wifi_data_provider_linux_unittest.cc',
           ],
         }],
         ['OS != "android" and OS != "ios"', {
           'dependencies': [
             '../third_party/libvpx/libvpx.gyp:libvpx',
           ],
         }],
-        ['OS == "android" and gtest_target_type == "shared_library"', {
+        ['OS == "android"', {
           'dependencies': [
             '../testing/android/native_test.gyp:native_test_native_code',
           ],
         }],
         ['use_aura!=1 and OS!="android"', {
           'sources!': [
             'browser/renderer_host/input/tap_suppression_controller_unittest.cc',
           ],
         }],
         ['use_dbus==0', {
@@ skipping 53 matching lines @@
           ],
           'include_dirs': [
             '..',
           ],
           'sources': [
             'browser/renderer_host/input/input_router_impl_perftest.cc',
             'common/cc_messages_perftest.cc',
             'test/run_all_perftests.cc',
           ],
           'conditions': [
-            ['OS == "android" and gtest_target_type == "shared_library"', {
+            ['OS == "android"', {
               'dependencies': [
                 '../testing/android/native_test.gyp:native_test_native_code',
               ],
             }],
           ],
         },
         {
           'target_name': 'content_browser_test_support',
           'type': 'static_library',
           'dependencies': [
@@ skipping 308 matching lines @@
             }],
             ['input_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 188 matching lines @@
             '../ui/gl/gl.gyp:gl',
             'content.gyp:content',
           ],
           'sources': [
             'common/gpu/media/video_accelerator_unittest_helpers.h',
             'common/gpu/media/video_encode_accelerator_unittest.cc',
           ],
         },
       ]
     }],
-    # Special target to wrap a gtest_target_type==shared_library
-    # content_unittests into an android apk for execution.
-    # See base.gyp for TODO(jrg)s about this strategy.
-    ['OS == "android" and gtest_target_type == "shared_library"', {
+    ['OS == "android"', {
       'targets': [
         {
           'target_name': 'content_gl_tests_apk',
           'type': 'none',
           'dependencies': [
             'content_gl_tests',
             'content_java_test_support',
           ],
           'variables': {
             'test_suite_name': 'content_gl_tests',
@@ skipping 320 matching lines @@
                   'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'],
                 },
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }