| Index: base/android/jni_generator/sample_for_tests.cc
|
| diff --git a/base/android/jni_generator/sample_for_tests.cc b/base/android/jni_generator/sample_for_tests.cc
|
| index 56c07121eb761db49a69e462600f5c3ec8bd3124..e0818b6773ba2f416b1bb0eee90342c2429ceb79 100644
|
| --- a/base/android/jni_generator/sample_for_tests.cc
|
| +++ b/base/android/jni_generator/sample_for_tests.cc
|
| @@ -51,8 +51,8 @@ void CPPClass::AddStructB(JNIEnv* env,
|
| const JavaParamRef<jobject>& caller,
|
| const JavaParamRef<jobject>& structb) {
|
| long key = Java_InnerStructB_getKey(env, structb);
|
| - std::string value = ConvertJavaStringToUTF8(
|
| - env, Java_InnerStructB_getValue(env, structb).obj());
|
| + std::string value =
|
| + ConvertJavaStringToUTF8(env, Java_InnerStructB_getValue(env, structb));
|
| map_[key] = value;
|
| }
|
|
|
| @@ -127,9 +127,9 @@ int main() {
|
| // Creates a "struct" that will then be used by the java side.
|
| ScopedJavaLocalRef<jobject> struct_a =
|
| base::android::Java_InnerStructA_create(
|
| - env, 0, 1, ConvertUTF8ToJavaString(env, "test").obj());
|
| - base::android::Java_SampleForTests_addStructA(
|
| - env, my_java_object, struct_a.obj());
|
| + env, 0, 1, ConvertUTF8ToJavaString(env, "test"));
|
| + base::android::Java_SampleForTests_addStructA(env, my_java_object,
|
| + struct_a);
|
| }
|
| base::android::Java_SampleForTests_iterateAndDoSomething(env, my_java_object);
|
| base::android::Java_SampleForTests_packagePrivateJavaMethod(env,
|
|
|