Update //base to chromium 9659b08ea5a34f889dc4166217f438095ddc10d2

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"
 // Generated file for JNI bindings from C++ to Java @CalledByNative methods.
 // Only to be included in one .cc file.
 // Name is based on the java file name: *.java -> jni/*_jni.h
 #include "jni/SampleForTests_jni.h"  // Generated by JNI.
 
 using base::android::AttachCurrentThread;
 using base::android::ScopedJavaLocalRef;
 
 namespace base {
 namespace android {
 
-jdouble CPPClass::InnerClass::MethodOtherP0(JNIEnv* env, jobject obj) {
+jdouble CPPClass::InnerClass::MethodOtherP0(JNIEnv* env, jobject caller) {
   return 0.0;
 }
 
 CPPClass::CPPClass() {
 }
 
 CPPClass::~CPPClass() {
 }
 
 // static
 bool CPPClass::RegisterJNI(JNIEnv* env) {
   return RegisterNativesImpl(env);  // Generated in SampleForTests_jni.h
 }
 
-void CPPClass::Destroy(JNIEnv* env, jobject obj) {
+void CPPClass::Destroy(JNIEnv* env, jobject caller) {
   delete this;
 }
 
-jint CPPClass::Method(JNIEnv* env, jobject obj) {
+jint CPPClass::Method(JNIEnv* env, jobject caller) {
   return 0;
 }
 
-void CPPClass::AddStructB(JNIEnv* env, jobject obj, jobject structb) {
+void CPPClass::AddStructB(JNIEnv* env, jobject caller, jobject structb) {
   long key = Java_InnerStructB_getKey(env, structb);
   std::string value = ConvertJavaStringToUTF8(
       env, Java_InnerStructB_getValue(env, structb).obj());
   map_[key] = value;
 }
 
-void CPPClass::IterateAndDoSomethingWithStructB(JNIEnv* env, jobject obj) {
+void CPPClass::IterateAndDoSomethingWithStructB(JNIEnv* env, jobject caller) {
   // 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) {
+    JNIEnv* env,
+    jobject caller) {
   base::android::ScopedJavaLocalRef<jstring> ret = ConvertUTF8ToJavaString(
       env, "test");
   return ret;
 }
 
 // Static free functions declared and called directly from java.
-static jlong Init(JNIEnv* env, jobject obj, jstring param) {
+static jlong Init(JNIEnv* env, jobject caller, jstring param) {
   return 0;
 }
 
 static jdouble GetDoubleFunction(JNIEnv*, jobject) {
   return 0;
 }
 
 static jfloat GetFloatFunction(JNIEnv*, jclass) {
   return 0;
 }
@@ skipping 31 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;
 }