Android: sync up latest JNI generator changes from downstream.

base/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"
 #include "jni/SampleForTests_jni.h"
@@ skipping 33 matching lines @@
 void CPPClass::IterateAndDoSomethingWithStructB(JNIEnv* env, jobject obj) {
   // Iterate over the elements and do something with them.
   for (std::map<long, std::string>::const_iterator it = map_.begin();
        it != map_.end(); ++it) {
     long key = it->first;
     std::string value = it->second;
   }
   map_.clear();
 }
 
+base::android::ScopedJavaLocalRef<jstring> CPPClass::ReturnAString(
+    JNIEnv* env, jobject obj) {
+  base::android::ScopedJavaLocalRef<jstring> ret = ConvertUTF8ToJavaString(
+      env, "test");
+  return ret;
+}
+
 // Static free functions declared and called directly from java.
 static jint Init(JNIEnv* env, jobject obj, jstring param) {
   return 0;
 }
 
 static jdouble GetDoubleFunction(JNIEnv*, jobject) {
   return 0;
 }
 
 static jfloat GetFloatFunction(JNIEnv*, jclass) {
@@ skipping 33 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;
 }