Catch intptr_t to int conversion on 64-bit platforms.

base/android/jni_generator/testFromJavaP.golden

Index: base/android/jni_generator/testFromJavaP.golden
diff --git a/base/android/jni_generator/testFromJavaP.golden b/base/android/jni_generator/testFromJavaP.golden
index d30acb1641f7ce86b6102ad20a80245c2ba8bfb1..57cbf4539e5375f1b9748bb671b8ede65fd53277 100644
--- a/base/android/jni_generator/testFromJavaP.golden
+++ b/base/android/jni_generator/testFromJavaP.golden
@@ -1,4 +1,4 @@
-// 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.
 
@@ -14,6 +14,8 @@
 
 #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";
@@ -70,9 +72,10 @@ static void Java_InputStream_close(JNIEnv* env, jobject obj) {
 }
 
 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);
@@ -85,7 +88,7 @@ static void Java_InputStream_mark(JNIEnv* env, jobject obj, jint p0) {
       &g_InputStream_mark);
 
      env->CallVoidMethod(obj,
-          method_id, p0);
+          method_id, p0.asJint());
   jni_generator::CheckException(env);
 
 }
@@ -159,12 +162,12 @@ static jint Java_InputStream_readI_AB(JNIEnv* env, jobject obj, jbyteArray p0) {
 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);
@@ -178,7 +181,7 @@ static jint Java_InputStream_readI_AB_I_I(JNIEnv* env, jobject obj, jbyteArray
 
   jint ret =
       env->CallIntMethod(obj,
-          method_id, p0, p1, p2);
+          method_id, p0, p1.asJint(), p2.asJint());
   jni_generator::CheckException(env);
   return ret;
 }