Android: sync up latest JNI generator changes from downstream.

base/android/jni_generator/testNativesLong.golden

Index: base/android/jni_generator/testNativesLong.golden
diff --git a/base/android/jni_generator/testNativesLong.golden b/base/android/jni_generator/testNativesLong.golden
index 5a862f28d3ec4c8355de73542e1057a25f9705ec..24d4a15074cddcece3828a298034d51c3c204c3d 100644
--- a/base/android/jni_generator/testNativesLong.golden
+++ b/base/android/jni_generator/testNativesLong.golden
@@ -1,4 +1,4 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -12,48 +12,46 @@
 
 #include <jni.h>
 
-#include "base/android/jni_android.h"
-#include "base/android/scoped_java_ref.h"
-#include "base/basictypes.h"
-#include "base/logging.h"
-
-using base::android::ScopedJavaLocalRef;
+#include "base/android/jni_generator/jni_generator_helper.h"
 
 // Step 1: forward declarations.
 namespace {
 const char kTestJniClassPath[] = "org/chromium/TestJni";
 // Leaking this jclass as we cannot use LazyInstance from some threads.
 jclass g_TestJni_clazz = NULL;
+
 }  // namespace
 
 // Step 2: method stubs.
-static void Destroy(JNIEnv* env, jobject obj,
+static void Destroy(JNIEnv* env, jobject jcaller,
     jlong nativeChromeBrowserProvider) {
-  DCHECK(nativeChromeBrowserProvider) << "Destroy";
   ChromeBrowserProvider* native =
       reinterpret_cast<ChromeBrowserProvider*>(nativeChromeBrowserProvider);
-  return native->Destroy(env, obj);
+  CHECK_NATIVE_PTR(env, jcaller, native, "Destroy");
+  return native->Destroy(env, jcaller);
 }
 
 // Step 3: RegisterNatives.
 
-static bool RegisterNativesImpl(JNIEnv* env) {
-
-  g_TestJni_clazz = reinterpret_cast<jclass>(env->NewGlobalRef(
-      base::android::GetClass(env, kTestJniClassPath).obj()));
-  static const JNINativeMethod kMethodsTestJni[] = {
+static const JNINativeMethod kMethodsTestJni[] = {
     { "nativeDestroy",
 "("
 "J"
 ")"
 "V", reinterpret_cast<void*>(Destroy) },
-  };
+};
+
+static bool RegisterNativesImpl(JNIEnv* env) {
+  g_TestJni_clazz = reinterpret_cast<jclass>(env->NewGlobalRef(
+      base::android::GetClass(env, kTestJniClassPath).obj()));
+
   const int kMethodsTestJniSize = arraysize(kMethodsTestJni);
 
   if (env->RegisterNatives(g_TestJni_clazz,
                            kMethodsTestJni,
                            kMethodsTestJniSize) < 0) {
-    LOG(ERROR) << "RegisterNatives failed in " << __FILE__;
+    jni_generator::HandleRegistrationError(
+        env, g_TestJni_clazz, __FILE__);
     return false;
   }