| Index: base/android/content_uri_utils.cc
|
| diff --git a/base/android/content_uri_utils.cc b/base/android/content_uri_utils.cc
|
| index 64d6ad24226e3c72a7a6a945c221dec12f9bdfe1..0e0c0ea6bb127840862a9e0689aa5a89be4a5950 100644
|
| --- a/base/android/content_uri_utils.cc
|
| +++ b/base/android/content_uri_utils.cc
|
| @@ -6,7 +6,6 @@
|
|
|
| #include "base/android/jni_android.h"
|
| #include "base/android/jni_string.h"
|
| -#include "base/platform_file.h"
|
| #include "jni/ContentUriUtils_jni.h"
|
|
|
| using base::android::ConvertUTF8ToJavaString;
|
| @@ -25,15 +24,15 @@ bool ContentUriExists(const FilePath& content_uri) {
|
| env, base::android::GetApplicationContext(), j_uri.obj());
|
| }
|
|
|
| -int OpenContentUriForRead(const FilePath& content_uri) {
|
| +File OpenContentUriForRead(const FilePath& content_uri) {
|
| JNIEnv* env = base::android::AttachCurrentThread();
|
| ScopedJavaLocalRef<jstring> j_uri =
|
| ConvertUTF8ToJavaString(env, content_uri.value());
|
| jint fd = Java_ContentUriUtils_openContentUriForRead(
|
| env, base::android::GetApplicationContext(), j_uri.obj());
|
| if (fd < 0)
|
| - return base::kInvalidPlatformFileValue;
|
| - return fd;
|
| + return File();
|
| + return File(fd);
|
| }
|
|
|
| } // namespace base
|
|
|