Update //base to chromium 9659b08ea5a34f889dc4166217f438095ddc10d2

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.
 
 #ifndef BASE_ANDROID_JNI_GENERATOR_SAMPLE_FOR_TESTS_H_
 #define BASE_ANDROID_JNI_GENERATOR_SAMPLE_FOR_TESTS_H_
 
 #include <jni.h>
 #include <map>
 #include <string>
@@ skipping 130 matching lines @@
   ~CPPClass();
 
   // Register C++ methods exposed to Java using JNI.
   static bool RegisterJNI(JNIEnv* env);
 
   // Java @CalledByNative methods implicitly available to C++ via the _jni.h
   // file included in the .cc file.
 
   class InnerClass {
    public:
-    jdouble MethodOtherP0(JNIEnv* env, jobject obj);
+    jdouble MethodOtherP0(JNIEnv* env, jobject caller);
   };
 
-  void Destroy(JNIEnv* env, jobject obj);
+  void Destroy(JNIEnv* env, jobject caller);
 
-  jint Method(JNIEnv* env, jobject obj);
+  jint Method(JNIEnv* env, jobject caller);
 
-  void AddStructB(JNIEnv* env, jobject obj, jobject structb);
+  void AddStructB(JNIEnv* env, jobject caller, jobject structb);
 
-  void IterateAndDoSomethingWithStructB(JNIEnv* env, jobject obj);
+  void IterateAndDoSomethingWithStructB(JNIEnv* env, jobject caller);
 
-  base::android::ScopedJavaLocalRef<jstring> ReturnAString(
-      JNIEnv* env, jobject obj);
+  base::android::ScopedJavaLocalRef<jstring> ReturnAString(JNIEnv* env,
+                                                           jobject caller);
 
  private:
   std::map<long, std::string> map_;
 
   DISALLOW_COPY_AND_ASSIGN(CPPClass);
 };
 
 }  // namespace android
 }  // namespace base
 
 #endif  // BASE_ANDROID_JNI_GENERATOR_SAMPLE_FOR_TESTS_H_