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

Unified Diff: net/android/gurl_utils.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
« no previous file with comments | « mojo/android/system/core_impl.cc ('k') | net/cert/x509_util_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/android/gurl_utils.cc
diff --git a/net/android/gurl_utils.cc b/net/android/gurl_utils.cc
index 8fcfe0d4f7486e1986c2d23e4625ba23606cd03e..c8cb1e4e9981bc51bee260cfad18e70076f0b72b 100644
--- a/net/android/gurl_utils.cc
+++ b/net/android/gurl_utils.cc
@@ -10,16 +10,18 @@
namespace net {
-ScopedJavaLocalRef<jstring> GetOrigin(JNIEnv* env, jclass clazz, jstring url) {
+jstring GetOrigin(JNIEnv* env, jclass clazz, jstring url) {
GURL host(base::android::ConvertJavaStringToUTF16(env, url));
- return base::android::ConvertUTF8ToJavaString(env, host.GetOrigin().spec());
+ return base::android::ConvertUTF8ToJavaString(env,
+ host.GetOrigin().spec()).Release();
}
-ScopedJavaLocalRef<jstring> GetScheme(JNIEnv* env, jclass clazz, jstring url) {
+jstring GetScheme(JNIEnv* env, jclass clazz, jstring url) {
GURL host(base::android::ConvertJavaStringToUTF16(env, url));
- return base::android::ConvertUTF8ToJavaString(env, host.scheme());
+ return base::android::ConvertUTF8ToJavaString(env,
+ host.scheme()).Release();
}
bool RegisterGURLUtils(JNIEnv* env) {
« no previous file with comments | « mojo/android/system/core_impl.cc ('k') | net/cert/x509_util_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698