Android: sync up latest JNI generator changes from downstream.

base/android/jni_generator/jni_generator_helper.h

+// Copyright 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.
+
+
+#ifndef BASE_ANDROID_JNI_GENERATOR_JNI_GENERATOR_HELPER_H_
+#define BASE_ANDROID_JNI_GENERATOR_JNI_GENERATOR_HELPER_H_
+
+#include <jni.h>
+
+#include "base/android/jni_android.h"
+#include "base/android/scoped_java_ref.h"
+#include "base/basictypes.h"
+#include "base/logging.h"
+
+// Project-specific macros used by the header files generated by
+// jni_generator.py. Different projects can then specify their own
+// implementation for this file.
+#define DCHECK_NATIVE_PTR(native_ptr, method_name, ...) \

[dawalker, 2013/12/13 21:41:08]

One comment that Tatsuo made before, and I would also like: Change this to
CHECK_NATIVE_PTR. The reason is that DCHECK_NATIVE_PTR is a bad name, because
it's an unconditional check in our implementation.

I know that has tension with the fact that this really is a DCHECK in Chrome's
implementation of the helper file, but to me that seems like an implementation
detail.

[dawalker, 2013/12/13 21:57:58]

I made this comment before I saw your comment on the Critique CL. I'm gonna
paste your response here, and then reply to it:
So, we're taking a different approach. In our header file, we do the check here
(in native code) and then throw a Java NullPointerException. It's by no means
too late to do the check natively, and this allows the check to be done
uniformly.
Yes, it's expected to be a small performance hit for us, but it's dwarfed by the
slowness of crossing the JNI boundary.
We're not using breakpad, so crashes in native code are *much* more painful for
us than uncaught exception crashes.
Right. My comment was along the lines that, since this macro enables an
unconditional check, it should be named accordingly. The fact that Chrome, in
its implementation, only does a DCHECK is the implementation detail. :)

[bulach, 2014/01/07 09:23:54]

Done.

+    DCHECK(native_ptr) << method_name;
+
+#define DCHECK_CLAZZ(clazz, ...) \

[dawalker, 2013/12/13 21:41:08]

ditto

[bulach, 2014/01/07 09:23:54]

Done.

+    DCHECK(clazz);
+
+namespace jni_generator {
+
+  inline void HandleRegistrationError(JNIEnv* env, jclass clazz,
+                                      const char* filename) {
+    LOG(ERROR) << "RegisterNatives failed in " << filename;
+  }
+
+  inline void CheckException(JNIEnv* env) {
+    base::android::CheckException(env);
+  }
+
+}  // namespace jni_generator
+
+using base::android::ScopedJavaLocalRef;
+
+#endif  // BASE_ANDROID_JNI_GENERATOR_JNI_GENERATOR_HELPER_H_