base/android/jni_generator/testNativeExportsOption.golden - Issue 1308363003: Revert of jni_generator: Make all object-returning natives return ScopedJavaLocalRef.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: base/android/jni_generator/testNativeExportsOption.golden

Issue 1308363003: Revert of jni_generator: Make all object-returning natives return ScopedJavaLocalRef. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « base/android/jni_generator/testFromJavaP.golden ('k') | base/android/jni_generator/testNativeExportsOptionalOption.golden » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: base/android/jni_generator/testNativeExportsOption.golden

diff --git a/base/android/jni_generator/testNativeExportsOption.golden b/base/android/jni_generator/testNativeExportsOption.golden

index 68736adaf392eb2b6a94e1bbe38273429754a869..d9b8d6a7a00c595c4ced65480e473f5041baea2d 100644

--- a/base/android/jni_generator/testNativeExportsOption.golden

+++ b/base/android/jni_generator/testNativeExportsOption.golden

@@ -95,7 +95,7 @@

static base::subtle::AtomicWord g_SampleForTests_testMethodWithParamAndReturn =

-static ScopedJavaLocalRef<jstring>

+static base::android::ScopedJavaLocalRef<jstring>

Java_SampleForTests_testMethodWithParamAndReturn(JNIEnv* env, jobject obj,

JniIntWrapper iParam) {

/* Must call RegisterNativesImpl() */

@@ -117,7 +117,7 @@

static_cast<jstring>(env->CallObjectMethod(obj,

method_id, as_jint(iParam)));

jni_generator::CheckException(env);

- return ScopedJavaLocalRef<jstring>(env, ret);

+ return base::android::ScopedJavaLocalRef<jstring>(env, ret);

}

static base::subtle::AtomicWord g_SampleForTests_testStaticMethodWithParam = 0;

@@ -170,7 +170,7 @@

static base::subtle::AtomicWord g_SampleForTests_testStaticMethodWithNoParam =

-static ScopedJavaLocalRef<jstring>

+static base::android::ScopedJavaLocalRef<jstring>

Java_SampleForTests_testStaticMethodWithNoParam(JNIEnv* env) {

/* Must call RegisterNativesImpl() */

CHECK_CLAZZ(env, SampleForTests_clazz(env),

@@ -190,7 +190,7 @@

static_cast<jstring>(env->CallStaticObjectMethod(SampleForTests_clazz(env),

method_id));

jni_generator::CheckException(env);

- return ScopedJavaLocalRef<jstring>(env, ret);

+ return base::android::ScopedJavaLocalRef<jstring>(env, ret);

}

// Step 3: RegisterNatives.