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) { |