Android: upstream few more jni_generator changes.

base/android/jni_generator/jni_generator_tests.py

Index: base/android/jni_generator/jni_generator_tests.py
diff --git a/base/android/jni_generator/jni_generator_tests.py b/base/android/jni_generator/jni_generator_tests.py
index 3b971059584e8d5639ce788a15db12213c4c94a5..92c7faa62b1c09c37cf3b458685416ff0e5c9c93 100755
--- a/base/android/jni_generator/jni_generator_tests.py
+++ b/base/android/jni_generator/jni_generator_tests.py
@@ -40,6 +40,8 @@ class TestOptions(object):
     self.ptr_type = 'long'
     self.jni_init_native_name = None
     self.eager_called_by_natives = False
+    self.cpp = 'cpp'
+    self.javap = 'javap'
 
 
 class TestGenerator(unittest.TestCase):
@@ -969,12 +971,12 @@ class Foo {
     long nativeTest;
 
     class Test {
-        private static native boolean initNativeClass();
+        private static native boolean nativeInitNativeClass();

[rmcilroy, 2014/01/14 10:13:52]

nit - nativeInitClass (for all)?

[bulach, 2014/01/16 11:03:49]

the first "native" is stripped from the C++ counter part, so the name in the
other side is "InitNativeClass"... it could be simplified, but it doesn't look
"too" redundant when looked from the other side :)
I'll leave as it is for consistency with the downstream version..

         private static native int nativeMethod(long nativeTest, int arg1);
     }
     """
     options = TestOptions()
-    options.jni_init_native_name = 'initNativeClass'
+    options.jni_init_native_name = 'nativeInitNativeClass'
     jni_from_java = jni_generator.JNIFromJavaSource(
         test_data, 'org/chromium/example/jni_generator/Test', options)
     self.assertGoldenTextEquals(jni_from_java.GetContent())
@@ -987,7 +989,7 @@ class Foo {
     long nativeTest;
 
     class Test {
-        private static native boolean initNativeClass();
+        private static native boolean nativeInitNativeClass();
         private static native int nativeMethod(long nativeTest, int arg1);
         @CalledByNative
         private void testMethodWithParam(int iParam);
@@ -1000,7 +1002,7 @@ class Foo {
     }
     """
     options = TestOptions()
-    options.jni_init_native_name = 'initNativeClass'
+    options.jni_init_native_name = 'nativeInitNativeClass'
     options.eager_called_by_natives = True
     jni_from_java = jni_generator.JNIFromJavaSource(
         test_data, 'org/chromium/example/jni_generator/Test', options)