Android: cleans up jni_generator_ptr_type.

The underlying rule is now "long" by default.
Mechanical change:
   git grep -l jni_generator_ptr_type | xargs sed -i /jni_generator_ptr_type/d
Relands crrev.com/270750 (reverted by 270849)

BUG=317523
TBR=darin@chromium.org

Review URL: https://codereview.chromium.org/288223005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271047 0039d316-1c4b-4281-b951-d872f2087c98

23 files changed, 0 insertions, 29 deletions

diff --git a/android_webview/android_webview_tests.gypi b/android_webview/android_webview_tests.gypi
index b95d7bf..887d504 100644
--- a/android_webview/android_webview_tests.gypi
+++ b/android_webview/android_webview_tests.gypi
@@ -131,7 +131,6 @@
       ],
       'variables': {
         'jni_gen_package': 'android_webview_unittests',
-        'jni_generator_ptr_type': 'long',
       },
       'includes': [ '../build/jni_generator.gypi' ],
     },
diff --git a/android_webview/native/webview_native.gyp b/android_webview/native/webview_native.gyp
index d5941421..854bd85 100644
--- a/android_webview/native/webview_native.gyp
+++ b/android_webview/native/webview_native.gyp
@@ -148,7 +148,6 @@
       ],
       'variables': {
         'jni_gen_package': 'android_webview',
-        'jni_generator_ptr_type': 'long',
       },
       'includes': [ '../../build/jni_generator.gypi' ],
       'dependencies': [
diff --git a/base/android/jni_generator/jni_generator.gyp b/base/android/jni_generator/jni_generator.gyp
index e93b446..2ea36b0 100644
--- a/base/android/jni_generator/jni_generator.gyp
+++ b/base/android/jni_generator/jni_generator.gyp
@@ -33,7 +33,6 @@
       ],
       'variables': {
         'jni_gen_package': 'example',
-        'jni_generator_ptr_type': 'long',
       },
       'includes': [ '../../../build/jni_generator.gypi' ],
     },
diff --git a/base/base.gyp b/base/base.gyp
index c56fb88..a60d710 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -1296,7 +1296,6 @@
           ],
           'variables': {
             'jni_gen_package': 'base',
-            'jni_generator_ptr_type': 'long',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
@@ -1308,7 +1307,6 @@
           ],
           'variables': {
             'jni_gen_package': 'base',
-            'jni_generator_ptr_type': 'long',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 87bfdf6..30d430f 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -3637,7 +3637,6 @@
           ],
           'variables': {
             'jni_gen_package': 'chrome',
-            'jni_generator_ptr_type': 'long',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
diff --git a/components/autofill.gypi b/components/autofill.gypi
index b494279..5972f5d1 100644
--- a/components/autofill.gypi
+++ b/components/autofill.gypi
@@ -461,7 +461,6 @@
           ],
           'variables': {
             'jni_gen_package': 'autofill',
-            'jni_generator_ptr_type': 'long',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
diff --git a/components/cronet.gypi b/components/cronet.gypi
index 5832c6e..55bc9d4 100644
--- a/components/cronet.gypi
+++ b/components/cronet.gypi
@@ -17,7 +17,6 @@
           ],
           'variables': {
             'jni_gen_package': 'cronet',
-            'jni_generator_ptr_type': 'long',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
diff --git a/components/navigation_interception.gypi b/components/navigation_interception.gypi
index 97d54b7..ed229ae 100644
--- a/components/navigation_interception.gypi
+++ b/components/navigation_interception.gypi
@@ -65,7 +65,6 @@
           ],
           'variables': {
             'jni_gen_package': 'navigation_interception',
-            'jni_generator_ptr_type': 'long',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
diff --git a/components/web_contents_delegate_android.gypi b/components/web_contents_delegate_android.gypi
index f0c8c94..fdea3b7 100644
--- a/components/web_contents_delegate_android.gypi
+++ b/components/web_contents_delegate_android.gypi
@@ -58,7 +58,6 @@
           ],
           'variables': {
             'jni_gen_package': 'web_contents_delegate_android',
-            'jni_generator_ptr_type': 'long',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
diff --git a/content/content.gyp b/content/content.gyp
index 1a71821..96daa44 100644
--- a/content/content.gyp
+++ b/content/content.gyp
@@ -517,7 +517,6 @@
           'type': 'none',
           'variables': {
              'jni_gen_package': 'content',
-             'jni_generator_ptr_type': 'long',
              'input_java_class': 'android/view/MotionEvent.class',
            },
           'includes': [ '../build/jar_file_jni_generator.gypi' ],
diff --git a/content/content_jni.gypi b/content/content_jni.gypi
index 2ad0dd7..42699aa 100644
--- a/content/content_jni.gypi
+++ b/content/content_jni.gypi
@@ -43,7 +43,6 @@
    ],
   'variables': {
     'jni_gen_package': 'content',
-    'jni_generator_ptr_type': 'long',
   },
   'includes': [ '../build/jni_generator.gypi' ],
 }
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index 1deffb8..7a4580e 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -943,7 +943,6 @@
           ],
           'variables': {
             'jni_gen_package': 'content/shell',
-            'jni_generator_ptr_type': 'long',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 0900959..9bd24d1 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -1617,7 +1617,6 @@
           ],
           'variables': {
             'jni_gen_package': 'content/shell',
-            'jni_generator_ptr_type': 'long',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
@@ -1644,7 +1643,6 @@
           ],
           'variables': {
             'jni_gen_package': 'content/public/test',
-            'jni_generator_ptr_type': 'long',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
diff --git a/media/media.gyp b/media/media.gyp
index c108335..9eeffde 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -1592,7 +1592,6 @@
           ],
           'variables': {
             'jni_gen_package': 'media',
-            'jni_generator_ptr_type': 'long',
           },
           'includes': ['../build/jni_generator.gypi'],
         },
@@ -1605,7 +1604,6 @@
           ],
           'variables': {
             'jni_gen_package': 'media',
-            'jni_generator_ptr_type': 'long',
           },
           'includes': ['../build/jni_generator.gypi'],
         },
diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp
index ff710fa..9d0b02c 100644
--- a/mojo/mojo.gyp
+++ b/mojo/mojo.gyp
@@ -688,7 +688,6 @@
           ],
           'variables': {
             'jni_gen_package': 'mojo',
-            'jni_generator_ptr_type': 'long',
          },
           'includes': [ '../build/jni_generator.gypi' ],
         },
@@ -776,7 +775,6 @@
           'type': 'none',
           'variables': {
             'jni_gen_package': 'mojo',
-            'jni_generator_ptr_type': 'long',
             'input_java_class': 'java/util/HashSet.class',
           },
           'includes': [ '../build/jar_file_jni_generator.gypi' ],
diff --git a/net/net.gyp b/net/net.gyp
index 2e5ee2c..2160c5c 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -1501,7 +1501,6 @@
           ],
           'variables': {
             'jni_gen_package': 'net',
-            'jni_generator_ptr_type': 'long',
           },
           'includes': [ '../build/jni_generator.gypi' ],
 
@@ -1521,7 +1520,6 @@
           ],
           'variables': {
             'jni_gen_package': 'net',
-            'jni_generator_ptr_type': 'long',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
diff --git a/printing/printing.gyp b/printing/printing.gyp
index 792f5df..5b22896 100644
--- a/printing/printing.gyp
+++ b/printing/printing.gyp
@@ -303,7 +303,6 @@
           ],
           'variables': {
             'jni_gen_package': 'printing',
-            'jni_generator_ptr_type': 'long',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
diff --git a/remoting/remoting_android.gypi b/remoting/remoting_android.gypi
index d0865d6..4fedb31 100644
--- a/remoting/remoting_android.gypi
+++ b/remoting/remoting_android.gypi
@@ -14,7 +14,6 @@
           ],
           'variables': {
             'jni_gen_package': 'remoting',
-            'jni_generator_ptr_type': 'long',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },  # end of target 'remoting_jni_headers'
diff --git a/sync/sync_android.gypi b/sync/sync_android.gypi
index bdeb2e4..40e4be2 100644
--- a/sync/sync_android.gypi
+++ b/sync/sync_android.gypi
@@ -11,7 +11,6 @@
           'type': 'none',
           'variables': {
             'java_in_dir': '../sync/android/java',
-            'jni_generator_ptr_type': 'long',
           },
           'dependencies': [
             '../base/base.gyp:base_java',
diff --git a/testing/android/native_test.gyp b/testing/android/native_test.gyp
index 0007a07..204ec4b 100644
--- a/testing/android/native_test.gyp
+++ b/testing/android/native_test.gyp
@@ -37,7 +37,6 @@
           ],
           'variables': {
             'jni_gen_package': 'testing',
-            'jni_generator_ptr_type': 'long',
           },
           'includes': [ '../../build/jni_generator.gypi' ],
         },
diff --git a/ui/base/ui_base.gyp b/ui/base/ui_base.gyp
index fded8c8..7b43363 100644
--- a/ui/base/ui_base.gyp
+++ b/ui/base/ui_base.gyp
@@ -629,7 +629,6 @@
            ],
            'variables': {
              'jni_gen_package': 'ui',
-             'jni_generator_ptr_type': 'long',
            },
            'includes': [ '../../build/jni_generator.gypi' ],
          },
diff --git a/ui/gfx/gfx.gyp b/ui/gfx/gfx.gyp
index dd0de8a..9f909f9 100644
--- a/ui/gfx/gfx.gyp
+++ b/ui/gfx/gfx.gyp
@@ -543,7 +543,6 @@
          ],
          'variables': {
            'jni_gen_package': 'ui/gfx',
-           'jni_generator_ptr_type': 'long'
          },
          'includes': [ '../../build/jni_generator.gypi' ],
        },
diff --git a/ui/gl/gl.gyp b/ui/gl/gl.gyp
index d27acc7..ec42a48 100644
--- a/ui/gl/gl.gyp
+++ b/ui/gl/gl.gyp
@@ -348,7 +348,6 @@
           'variables': {
             'jni_gen_package': 'ui/gl',
             'input_java_class': 'android/view/Surface.class',
-            'jni_generator_ptr_type': 'long',
           },
           'includes': [ '../../build/jar_file_jni_generator.gypi' ],
         },
@@ -364,7 +363,6 @@
           ],
           'variables': {
             'jni_gen_package': 'ui/gl',
-            'jni_generator_ptr_type': 'long',
           },
           'includes': [ '../../build/jni_generator.gypi' ],
         },