content/shell/browser/shell_mojo_test_utils_android.cc - Issue 1288183004: 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: content/shell/browser/shell_mojo_test_utils_android.cc

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

Patch Set: Add some newlines for readability 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

« chrome/browser/signin/oauth2_token_service_delegate_android.h ('K') | « content/browser/web_contents/web_contents_android.cc ('k') | mojo/android/system/core_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/shell/browser/shell_mojo_test_utils_android.cc

diff --git a/content/shell/browser/shell_mojo_test_utils_android.cc b/content/shell/browser/shell_mojo_test_utils_android.cc

index 966aa5b143174a49244cd11506eb19870aad6d7f..04d3ad6aad92530e7213b6f790f4fa11ddb743e2 100644

--- a/content/shell/browser/shell_mojo_test_utils_android.cc

+++ b/content/shell/browser/shell_mojo_test_utils_android.cc

@@ -33,9 +33,10 @@ static void TearDownTestEnvironment(JNIEnv* env,

delete reinterpret_cast<TestEnvironment*>(test_environment);

}

-static jobject CreateServiceRegistryPair(JNIEnv* env,

- jclass jcaller,

- jlong native_test_environment) {

+static ScopedJavaLocalRef<jobject> CreateServiceRegistryPair(

+ JNIEnv* env,

+ jclass jcaller,

+ jlong native_test_environment) {

TestEnvironment* test_environment =

reinterpret_cast<TestEnvironment*>(native_test_environment);

@@ -60,7 +61,7 @@ static jobject CreateServiceRegistryPair(JNIEnv* env,

test_environment->wrappers.push_back(wrapper_b);

return Java_ShellMojoTestUtils_makePair(env, wrapper_a->GetObj().obj(),

- wrapper_b->GetObj().obj()).Release();

+ wrapper_b->GetObj().obj());

}

static void RunLoop(JNIEnv* env, jclass jcaller, jlong timeout_ms) {