Catch intptr_t to int conversion on 64-bit platforms.

base/android/jni_generator/testFromJavaP.golden

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2014 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.
 
 // This file is autogenerated by
 //     base/android/jni_generator/jni_generator.py
 // For
 //     java/io/InputStream
 
 #ifndef java_io_InputStream_JNI
 #define java_io_InputStream_JNI
 
 #include <jni.h>
 
 #include "base/android/jni_generator/jni_generator_helper.h"
 
+#include "base/android/jni_int_wrapper.h"
+
 // Step 1: forward declarations.
 namespace {
 const char kInputStreamClassPath[] = "java/io/InputStream";
 // Leaking this jclass as we cannot use LazyInstance from some threads.
 jclass g_InputStream_clazz = NULL;
 
 }  // namespace
 
 namespace JNI_InputStream {
 
@@ skipping 36 matching lines @@
       "()V",
       &g_InputStream_close);
 
      env->CallVoidMethod(obj,
           method_id);
   jni_generator::CheckException(env);
 
 }
 
 static base::subtle::AtomicWord g_InputStream_mark = 0;
-static void Java_InputStream_mark(JNIEnv* env, jobject obj, jint p0)
+static void Java_InputStream_mark(JNIEnv* env, jobject obj, jni_int_wrapper p0)
     __attribute__ ((unused));
-static void Java_InputStream_mark(JNIEnv* env, jobject obj, jint p0) {
+static void Java_InputStream_mark(JNIEnv* env, jobject obj, jni_int_wrapper p0)
+    {
   /* Must call RegisterNativesImpl()  */
   CHECK_CLAZZ(env, obj,
       g_InputStream_clazz);
   jmethodID method_id =
       base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_INSTANCE>(
       env, g_InputStream_clazz,
       "mark",
       "(I)V",
       &g_InputStream_mark);
 
      env->CallVoidMethod(obj,
-          method_id, p0);
+          method_id, p0.asJint());
   jni_generator::CheckException(env);
 
 }
 
 static base::subtle::AtomicWord g_InputStream_markSupported = 0;
 static jboolean Java_InputStream_markSupported(JNIEnv* env, jobject obj)
     __attribute__ ((unused));
 static jboolean Java_InputStream_markSupported(JNIEnv* env, jobject obj) {
   /* Must call RegisterNativesImpl()  */
   CHECK_CLAZZ(env, obj,
@@ skipping 53 matching lines @@
   jint ret =
       env->CallIntMethod(obj,
           method_id, p0);
   jni_generator::CheckException(env);
   return ret;
 }
 
 static base::subtle::AtomicWord g_InputStream_readI_AB_I_I = 0;
 static jint Java_InputStream_readI_AB_I_I(JNIEnv* env, jobject obj, jbyteArray
     p0,
-    jint p1,
-    jint p2) __attribute__ ((unused));
+    jni_int_wrapper p1,
+    jni_int_wrapper p2) __attribute__ ((unused));
 static jint Java_InputStream_readI_AB_I_I(JNIEnv* env, jobject obj, jbyteArray
     p0,
-    jint p1,
-    jint p2) {
+    jni_int_wrapper p1,
+    jni_int_wrapper p2) {
   /* Must call RegisterNativesImpl()  */
   CHECK_CLAZZ(env, obj,
       g_InputStream_clazz, 0);
   jmethodID method_id =
       base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_INSTANCE>(
       env, g_InputStream_clazz,
       "read",
       "([BII)I",
       &g_InputStream_readI_AB_I_I);
 
   jint ret =
       env->CallIntMethod(obj,
-          method_id, p0, p1, p2);
+          method_id, p0, p1.asJint(), p2.asJint());
   jni_generator::CheckException(env);
   return ret;
 }
 
 static base::subtle::AtomicWord g_InputStream_reset = 0;
 static void Java_InputStream_reset(JNIEnv* env, jobject obj) __attribute__
     ((unused));
 static void Java_InputStream_reset(JNIEnv* env, jobject obj) {
   /* Must call RegisterNativesImpl()  */
   CHECK_CLAZZ(env, obj,
@@ skipping 62 matching lines @@
 static bool RegisterNativesImpl(JNIEnv* env) {
   g_InputStream_clazz = reinterpret_cast<jclass>(env->NewGlobalRef(
       base::android::GetClass(env, kInputStreamClassPath).obj()));
 
   return true;
 }
 
 }  // namespace JNI_InputStream
 
 #endif  // java_io_InputStream_JNI