Update to Chromium //base at Chromium commit 3e81715e6d3a4324362635aea46ce1f1a163cca1.

android/jni_generator/jni_generator_tests.py

 #!/usr/bin/env python
 # 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.
 
 """Tests for jni_generator.py.
 
 This test suite contains various tests for the JNI generator.
 It exercises the low-level parser all the way up to the
 code generator and ensures the output matches a golden
@@ skipping 131 matching lines @@
             Long date, byte[] favicon, String title, Integer visits);
     native int nativeFindAll(String find);
     private static native OnFrameAvailableListener nativeGetInnerClass();
     private native Bitmap nativeQueryBitmap(
             int nativeChromeBrowserProvider,
             String[] projection, String selection,
             String[] selectionArgs, String sortOrder);
     private native void nativeGotOrientation(
             int nativeDataFetcherImplAndroid,
             double alpha, double beta, double gamma);
+    private static native Throwable nativeMessWithJavaException(Throwable e);
     """
     jni_generator.JniParams.SetFullyQualifiedClass(
         'org/chromium/example/jni_generator/SampleForTests')
     jni_generator.JniParams.ExtractImportsAndInnerClasses(test_data)
     natives = jni_generator.ExtractNatives(test_data, 'int')
     golden_natives = [
         NativeMethod(return_type='int', static=False,
                      name='Init',
                      params=[],
                      java_class_name=None,
@@ skipping 103 matching lines @@
                              Param(datatype='double',
                                    name='alpha'),
                              Param(datatype='double',
                                    name='beta'),
                              Param(datatype='double',
                                    name='gamma'),
                             ],
                      java_class_name=None,
                      type='method',
                      p0_type='content::DataFetcherImplAndroid'),
+        NativeMethod(return_type='Throwable', static=True,
+                     name='MessWithJavaException',
+                     params=[Param(datatype='Throwable', name='e')],
+                     java_class_name=None,
+                     type='function')
     ]
     self.assertListEquals(golden_natives, natives)
     h = jni_generator.InlHeaderFileGenerator('', 'org/chromium/TestJni',
                                              natives, [], [], TestOptions())
     self.assertGoldenTextEquals(h.GetContent())
 
   def testInnerClassNatives(self):
     test_data = """
     class MyInnerClass {
       @NativeCall("MyInnerClass")
@@ skipping 858 matching lines @@
   test_result = unittest.main(argv=argv[0:1], exit=False)
 
   if test_result.result.wasSuccessful() and options.stamp:
     TouchStamp(options.stamp)
 
   return not test_result.result.wasSuccessful()
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))