Roll base to ec59756cc1ad02cc835bcca10056a621c9eb346c.

mojo/android/javatests/validation_test_util.cc

Index: mojo/android/javatests/validation_test_util.cc
diff --git a/mojo/android/javatests/validation_test_util.cc b/mojo/android/javatests/validation_test_util.cc
index 2289e025a838b3bd70b954763d2a908bce0a1e1a..dec90cc3a02b83c81f5cc98538d83218a497343d 100644
--- a/mojo/android/javatests/validation_test_util.cc
+++ b/mojo/android/javatests/validation_test_util.cc
@@ -18,7 +18,9 @@ bool RegisterValidationTestUtil(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
-jobject ParseData(JNIEnv* env, jclass jcaller, jstring data_as_string) {
+ScopedJavaLocalRef<jobject> ParseData(JNIEnv* env,
+                                      jclass jcaller,
+                                      jstring data_as_string) {
   std::string input =
       base::android::ConvertJavaStringToUTF8(env, data_as_string);
   std::vector<uint8_t> data;
@@ -28,8 +30,8 @@ jobject ParseData(JNIEnv* env, jclass jcaller, jstring data_as_string) {
           input, &data, &num_handles, &error_message)) {
     ScopedJavaLocalRef<jstring> j_error_message =
         base::android::ConvertUTF8ToJavaString(env, error_message);
-    return Java_ValidationTestUtil_buildData(
-               env, NULL, 0, j_error_message.obj()).Release();
+    return Java_ValidationTestUtil_buildData(env, NULL, 0,
+                                             j_error_message.obj());
   }
   void* data_ptr = &data[0];
   if (!data_ptr) {
@@ -38,8 +40,7 @@ jobject ParseData(JNIEnv* env, jclass jcaller, jstring data_as_string) {
   }
   jobject byte_buffer =
       env->NewDirectByteBuffer(data_ptr, data.size());
-  return Java_ValidationTestUtil_buildData(env, byte_buffer, num_handles, NULL)
-      .Release();
+  return Java_ValidationTestUtil_buildData(env, byte_buffer, num_handles, NULL);
 }
 
 }  // namespace android