Roll base to ec59756cc1ad02cc835bcca10056a621c9eb346c.

shell/android/android_handler.cc

 // Copyright 2014 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 "shell/android/android_handler.h"
 
 #include <fcntl.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
@@ skipping 139 matching lines @@
           *extracted_dir = base::FilePath(
               std::string(reinterpret_cast<char*>(&extracted_path.front()),
                           extracted_path.size()));
           *cache_dir = base::FilePath(std::string(
               reinterpret_cast<char*>(&cache_path.front()), cache_path.size()));
         }
         callback.Run();
       });
 }
 
-jstring CreateTemporaryFile(JNIEnv* env,
-                            jclass jcaller,
-                            jstring j_directory,
-                            jstring j_basename,
-                            jstring j_extension) {
+ScopedJavaLocalRef<jstring> CreateTemporaryFile(JNIEnv* env,
+                                                jclass jcaller,
+                                                jstring j_directory,
+                                                jstring j_basename,
+                                                jstring j_extension) {
   std::string basename(ConvertJavaStringToUTF8(env, j_basename));
   std::string extension(ConvertJavaStringToUTF8(env, j_extension));
   base::FilePath directory(ConvertJavaStringToUTF8(env, j_directory));
 
   for (;;) {
     std::string random = base::RandBytesAsString(16);
     std::string filename =
         basename + base::HexEncode(random.data(), random.size()) + extension;
     base::FilePath temporary_file = directory.Append(filename);
     int fd = open(temporary_file.value().c_str(), O_CREAT | O_EXCL, 0600);
     if (fd != -1) {
       close(fd);
-      return ConvertUTF8ToJavaString(env, temporary_file.value()).Release();
+      return ConvertUTF8ToJavaString(env, temporary_file.value());
     }
   }
 }
 
 bool RegisterAndroidHandlerJni(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace shell