Android: sync up latest JNI generator changes from downstream.

base/android/jni_generator/sample_for_tests.h

 // Copyright (c) 2013 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 <jni.h>
 #include <map>
 #include <string>
 
+#include "base/android/jni_android.h"
 #include "base/basictypes.h"
 
 namespace base {
 namespace android {
 
 // This file is used to:
 // - document the best practices and guidelines on JNI usage.
 // - ensure sample_for_tests_jni.h compiles and the functions declared in it
 // as expected.
 //
@@ skipping 10 matching lines @@
   };
 
   void Destroy(JNIEnv* env, jobject obj);
 
   jint Method(JNIEnv* env, jobject obj);
 
   void AddStructB(JNIEnv* env, jobject obj, jobject structb);
 
   void IterateAndDoSomethingWithStructB(JNIEnv* env, jobject obj);
 
+  base::android::ScopedJavaLocalRef<jstring> ReturnAString(
+      JNIEnv* env, jobject obj);
+
  private:
   std::map<long, std::string> map_;
 
   DISALLOW_COPY_AND_ASSIGN(CPPClass);
 };
 
 }  // namespace android
 }  // namespace base