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

android/jni_generator/testNatives.golden

Index: android/jni_generator/testNatives.golden
diff --git a/android/jni_generator/testNatives.golden b/android/jni_generator/testNatives.golden
index 64f76c10d8931f03d07fc1475ced52bacffe4492..b19c337a89e3562a1a8a13ccdef5369befd42d86 100644
--- a/android/jni_generator/testNatives.golden
+++ b/android/jni_generator/testNatives.golden
@@ -55,13 +55,14 @@ static jlong Java_org_chromium_TestJni_nativeAddBookmark(JNIEnv* env,
   return native->AddBookmark(env, jcaller, url, title, isFolder, parentId);
 }
 
-static jstring GetDomainAndRegistry(JNIEnv* env, jclass jcaller,
+static ScopedJavaLocalRef<jstring> GetDomainAndRegistry(JNIEnv* env, jclass
+    jcaller,
     jstring url);
 
 static jstring Java_org_chromium_TestJni_nativeGetDomainAndRegistry(JNIEnv* env,
     jclass jcaller,
     jstring url) {
-  return GetDomainAndRegistry(env, jcaller, url);
+  return GetDomainAndRegistry(env, jcaller, url).Release();
 }
 
 static void CreateHistoricalTabFromState(JNIEnv* env, jclass jcaller,
@@ -75,21 +76,23 @@ static void Java_org_chromium_TestJni_nativeCreateHistoricalTabFromState(JNIEnv*
   return CreateHistoricalTabFromState(env, jcaller, state, tab_index);
 }
 
-static jbyteArray GetStateAsByteArray(JNIEnv* env, jobject jcaller,
+static ScopedJavaLocalRef<jbyteArray> GetStateAsByteArray(JNIEnv* env, jobject
+    jcaller,
     jobject view);
 
 static jbyteArray Java_org_chromium_TestJni_nativeGetStateAsByteArray(JNIEnv*
     env, jobject jcaller,
     jobject view) {
-  return GetStateAsByteArray(env, jcaller, view);
+  return GetStateAsByteArray(env, jcaller, view).Release();
 }
 
-static jobjectArray GetAutofillProfileGUIDs(JNIEnv* env, jclass jcaller);
+static ScopedJavaLocalRef<jobjectArray> GetAutofillProfileGUIDs(JNIEnv* env,
+    jclass jcaller);
 
 static jobjectArray
     Java_org_chromium_TestJni_nativeGetAutofillProfileGUIDs(JNIEnv* env, jclass
     jcaller) {
-  return GetAutofillProfileGUIDs(env, jcaller);
+  return GetAutofillProfileGUIDs(env, jcaller).Release();
 }
 
 static void SetRecognitionResults(JNIEnv* env, jobject jcaller,
@@ -129,11 +132,11 @@ static jint Java_org_chromium_TestJni_nativeFindAll(JNIEnv* env, jobject
   return FindAll(env, jcaller, find);
 }
 
-static jobject GetInnerClass(JNIEnv* env, jclass jcaller);
+static ScopedJavaLocalRef<jobject> GetInnerClass(JNIEnv* env, jclass jcaller);
 
 static jobject Java_org_chromium_TestJni_nativeGetInnerClass(JNIEnv* env, jclass
     jcaller) {
-  return GetInnerClass(env, jcaller);
+  return GetInnerClass(env, jcaller).Release();
 }
 
 static jobject Java_org_chromium_TestJni_nativeQueryBitmap(JNIEnv* env,
@@ -162,6 +165,16 @@ static void Java_org_chromium_TestJni_nativeGotOrientation(JNIEnv* env,
   return native->GotOrientation(env, jcaller, alpha, beta, gamma);
 }
 
+static ScopedJavaLocalRef<jthrowable> MessWithJavaException(JNIEnv* env, jclass
+    jcaller,
+    jthrowable e);
+
+static jthrowable Java_org_chromium_TestJni_nativeMessWithJavaException(JNIEnv*
+    env, jclass jcaller,
+    jthrowable e) {
+  return MessWithJavaException(env, jcaller, e).Release();
+}
+
 // Step 3: RegisterNatives.
 
 static const JNINativeMethod kMethodsTestJni[] = {
@@ -260,6 +273,13 @@ static const JNINativeMethod kMethodsTestJni[] = {
 "D"
 ")"
 "V", reinterpret_cast<void*>(Java_org_chromium_TestJni_nativeGotOrientation) },
+    { "nativeMessWithJavaException",
+"("
+"Ljava/lang/Throwable;"
+")"
+"Ljava/lang/Throwable;",
+    reinterpret_cast<void*>(Java_org_chromium_TestJni_nativeMessWithJavaException)
+    },
 };
 
 static bool RegisterNativesImpl(JNIEnv* env) {