Update to Chromium //base at Chromium commit 3e81715e6d3a4324362635aea46ce1f1a163cca1.

android/command_line_android.cc

 // Copyright 2013 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 "base/android/command_line_android.h"
 
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 22 matching lines @@
 
 static void Reset(JNIEnv* env, jclass clazz) {
   CommandLine::Reset();
 }
 
 static jboolean HasSwitch(JNIEnv* env, jclass clazz, jstring jswitch) {
   std::string switch_string(ConvertJavaStringToUTF8(env, jswitch));
   return CommandLine::ForCurrentProcess()->HasSwitch(switch_string);
 }
 
-static jstring GetSwitchValue(JNIEnv* env, jclass clazz, jstring jswitch) {
+static ScopedJavaLocalRef<jstring> GetSwitchValue(JNIEnv* env,
+                                                  jclass clazz,
+                                                  jstring jswitch) {
   std::string switch_string(ConvertJavaStringToUTF8(env, jswitch));
   std::string value(CommandLine::ForCurrentProcess()->GetSwitchValueNative(
       switch_string));
   if (value.empty())
-    return 0;
-  // OK to release, JNI binding.
-  return ConvertUTF8ToJavaString(env, value).Release();
+    return ScopedJavaLocalRef<jstring>();
+  return ConvertUTF8ToJavaString(env, value);
 }
 
 static void AppendSwitch(JNIEnv* env, jclass clazz, jstring jswitch) {
   std::string switch_string(ConvertJavaStringToUTF8(env, jswitch));
   CommandLine::ForCurrentProcess()->AppendSwitch(switch_string);
 }
 
 static void AppendSwitchWithValue(JNIEnv* env, jclass clazz,
                                   jstring jswitch, jstring jvalue) {
   std::string switch_string(ConvertJavaStringToUTF8(env, jswitch));
@@ skipping 16 matching lines @@
   CommandLine::Init(0, NULL);
   AppendJavaStringArrayToCommandLine(env, array, true);
 }
 
 bool RegisterCommandLine(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android
 }  // namespace base