Roll base to ec59756cc1ad02cc835bcca10056a621c9eb346c.

net/android/gurl_utils.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/android/gurl_utils.h"
 
 #include "base/android/jni_string.h"
 #include "jni/GURLUtils_jni.h"
 #include "url/gurl.h"
 
 namespace net {
 
-jstring GetOrigin(JNIEnv* env, jclass clazz, jstring url) {
+ScopedJavaLocalRef<jstring> GetOrigin(JNIEnv* env, jclass clazz, jstring url) {
   GURL host(base::android::ConvertJavaStringToUTF16(env, url));
 
-  return base::android::ConvertUTF8ToJavaString(env,
-      host.GetOrigin().spec()).Release();
+  return base::android::ConvertUTF8ToJavaString(env, host.GetOrigin().spec());
 }
 
-jstring GetScheme(JNIEnv* env, jclass clazz, jstring url) {
+ScopedJavaLocalRef<jstring> GetScheme(JNIEnv* env, jclass clazz, jstring url) {
   GURL host(base::android::ConvertJavaStringToUTF16(env, url));
 
-  return base::android::ConvertUTF8ToJavaString(env,
-      host.scheme()).Release();
+  return base::android::ConvertUTF8ToJavaString(env, host.scheme());
 }
 
 bool RegisterGURLUtils(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // net namespace