Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(326)

Unified Diff: components/cronet/android/test/mock_url_request_job_factory.cc

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
Index: components/cronet/android/test/mock_url_request_job_factory.cc
diff --git a/components/cronet/android/test/mock_url_request_job_factory.cc b/components/cronet/android/test/mock_url_request_job_factory.cc
index 14fbfe1fad7a0d362f573a696c0d5dd8a0d22c12..9c094549276ee2460976844f629f506d18015ea2 100644
--- a/components/cronet/android/test/mock_url_request_job_factory.cc
+++ b/components/cronet/android/test/mock_url_request_job_factory.cc
@@ -20,30 +20,29 @@
net::SSLCertificateErrorJob::AddUrlHandler();
}
-ScopedJavaLocalRef<jstring> GetMockUrlWithFailure(JNIEnv* jenv,
- jclass jcaller,
- jint jphase,
- jint jnet_error) {
+jstring GetMockUrlWithFailure(JNIEnv* jenv,
+ jclass jcaller,
+ jint jphase,
+ jint jnet_error) {
GURL url(net::URLRequestFailedJob::GetMockHttpUrlWithFailurePhase(
static_cast<net::URLRequestFailedJob::FailurePhase>(jphase),
static_cast<int>(jnet_error)));
- return base::android::ConvertUTF8ToJavaString(jenv, url.spec());
+ return base::android::ConvertUTF8ToJavaString(jenv, url.spec()).Release();
}
-ScopedJavaLocalRef<jstring> GetMockUrlForData(JNIEnv* jenv,
- jclass jcaller,
- jstring jdata,
- jint jdata_repeat_count) {
+jstring GetMockUrlForData(JNIEnv* jenv,
+ jclass jcaller,
+ jstring jdata,
+ jint jdata_repeat_count) {
std::string data(base::android::ConvertJavaStringToUTF8(jenv, jdata));
GURL url(net::URLRequestMockDataJob::GetMockHttpUrl(data,
jdata_repeat_count));
- return base::android::ConvertUTF8ToJavaString(jenv, url.spec());
+ return base::android::ConvertUTF8ToJavaString(jenv, url.spec()).Release();
}
-ScopedJavaLocalRef<jstring> GetMockUrlForSSLCertificateError(JNIEnv* jenv,
- jclass jcaller) {
+jstring GetMockUrlForSSLCertificateError(JNIEnv* jenv, jclass jcaller) {
GURL url(net::SSLCertificateErrorJob::GetMockUrl());
- return base::android::ConvertUTF8ToJavaString(jenv, url.spec());
+ return base::android::ConvertUTF8ToJavaString(jenv, url.spec()).Release();
}
bool RegisterMockUrlRequestJobFactory(JNIEnv* env) {
« no previous file with comments | « components/cronet/android/cronet_library_loader.cc ('k') | components/cronet/android/test/native_test_server.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698