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

android/jni_generator/sample_for_tests.cc

 // 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.
 
 #include "base/android/jni_generator/sample_for_tests.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 // Generated file for JNI bindings from C++ to Java @CalledByNative methods.
@@ skipping 64 matching lines @@
   return 0;
 }
 
 static jfloat GetFloatFunction(JNIEnv*, jclass) {
   return 0;
 }
 
 static void SetNonPODDatatype(JNIEnv*, jobject, jobject) {
 }
 
-static jobject GetNonPODDatatype(JNIEnv*, jobject) {
-  return NULL;
+static ScopedJavaLocalRef<jobject> GetNonPODDatatype(JNIEnv*, jobject) {
+  return ScopedJavaLocalRef<jobject>();
 }
 
 static jint InnerFunction(JNIEnv*, jclass) {
   return 0;
 }
 
 } // namespace android
 } // namespace base
 
 int main() {
@@ skipping 15 matching lines @@
     ScopedJavaLocalRef<jobject> struct_a =
         base::android::Java_InnerStructA_create(
             env, 0, 1,
             base::android::ConvertUTF8ToJavaString(env, "test").obj());
     base::android::Java_SampleForTests_addStructA(
         env, my_java_object, struct_a.obj());
   }
   base::android::Java_SampleForTests_iterateAndDoSomething(env, my_java_object);
   return 0;
 }