Revert 270750 "Android: cleans up jni_generator_ptr_type."

trunk/src/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 1598 matching lines @@
           ],
         },
         {
           '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',
+            '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',
           },
           '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'],
                 },
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }