Android: moves some content test targets to use long for JNI.

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': 'test_support_content',
       'type': 'static_library',
       'dependencies': [
@@ skipping 799 matching lines @@
         ['use_aura!=1 and OS!="win" and OS!="android"', {
           'sources!': [
             'browser/renderer_host/input/tap_suppression_controller_unittest.cc',
           ],
         }],
         ['enable_webrtc==1 and google_tv==1', {
           'sources': [
             'renderer/media/rtc_video_decoder_factory_tv_unittest.cc',
           ],
         }],
-        ['use_dbus==0', {

[bulach, 2014/01/10 09:16:30]

my editor is configured to replace tabs, I'm happy to put in a separate patch if
you prefer..

+        ['use_dbus==0', {
           'sources!': [
             'browser/geolocation/wifi_data_provider_linux_unittest.cc',
           ],
-        }],
+        }],
       ],
     },
   ],
   'conditions': [
     ['test_isolation_mode != "noop"', {
       'targets': [
-        {
-          'target_name': 'content_unittests_run',
-          'type': 'none',
-          'dependencies': [
-            'content_unittests',
-          ],
-          'includes': [
-            '../build/isolate.gypi',
-            'content_unittests.isolate',
-          ],
-          'sources': [
-            'content_unittests.isolate',
-          ],
-        },
+        {
+          'target_name': 'content_unittests_run',
+          'type': 'none',
+          'dependencies': [
+            'content_unittests',
+          ],
+          'includes': [
+            '../build/isolate.gypi',
+            'content_unittests.isolate',
+          ],
+          'sources': [
+            'content_unittests.isolate',
+          ],
+       },
       ],
     }],
     ['OS!="ios"', {
       'targets': [
         {
           'target_name': 'content_perftests',
           'type': '<(gtest_target_type)',
           'defines!': ['CONTENT_IMPLEMENTATION'],
           'dependencies': [
             'content.gyp:content_common',
@@ skipping 579 matching lines @@
           ],
         },
         {
           'target_name': 'content_android_linker_test_jni_headers',
           'type': 'none',
           'sources': [
             'shell/android/linker_test_apk/src/org/chromium/content_linker_test_apk/LinkerTests.java',
           ],
           'variables': {
             'jni_gen_package': 'content/shell',
+            'jni_generator_ptr_type': 'long',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
         {
           'target_name': 'video_decode_accelerator_unittest_apk',
           'type': 'none',
           'dependencies': [
             'video_decode_accelerator_unittest',
           ],
           'variables': {
             'test_suite_name': 'video_decode_accelerator_unittest',
             'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)content_unittests<(SHARED_LIB_SUFFIX)',
           },
           'includes': [ '../build/apk_test.gypi' ],
         },
       ],
     }],
     ['OS == "android"', {
       'targets': [
         {
           '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',
+            'jni_generator_ptr_type': 'long',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
         {
           'target_name': 'content_java_test_support',
           'type': 'none',
           'dependencies': [
             '../base/base.gyp:base',
             '../base/base.gyp:base_java_test_support',
             'content.gyp:content_common',
@@ skipping 169 matching lines @@
                   'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'],
                 },
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }