components/cronet/android/cronet_histogram_manager.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: components/cronet/android/cronet_histogram_manager.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') | « components/cronet/android/chromium_url_request_context.cc ('k') | components/cronet/android/cronet_library_loader.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/cronet/android/cronet_histogram_manager.cc

diff --git a/components/cronet/android/cronet_histogram_manager.cc b/components/cronet/android/cronet_histogram_manager.cc

index de1989bdef57b5537fe9b7b417712fa17c10eb62..ae0de70dd35431d08b431a5e23065057f7ad2e40 100644

--- a/components/cronet/android/cronet_histogram_manager.cc

+++ b/components/cronet/android/cronet_histogram_manager.cc

@@ -24,11 +24,12 @@ static void EnsureInitialized(JNIEnv* env, jobject jcaller) {

base::StatisticsRecorder::Initialize();

}

-static jbyteArray GetHistogramDeltas(JNIEnv* env, jobject jcaller) {

+static ScopedJavaLocalRef<jbyteArray> GetHistogramDeltas(JNIEnv* env,

+ jobject jcaller) {

std::vector<uint8> data;

if (!HistogramManager::GetInstance()->GetDeltas(&data))

- return NULL;

- return base::android::ToJavaByteArray(env, &data[0], data.size()).Release();

+ return ScopedJavaLocalRef<jbyteArray>();

+ return base::android::ToJavaByteArray(env, &data[0], data.size());

}

} // namespace cronet