| Index: base/android/content_uri_utils.cc
|
| diff --git a/base/android/content_uri_utils.cc b/base/android/content_uri_utils.cc
|
| index f7484cf5c724a63a34fdb6c8fcbfd2fb94ba4925..a7955dca6b3bd6f5f4dd72ab833a8d24182f7189 100644
|
| --- a/base/android/content_uri_utils.cc
|
| +++ b/base/android/content_uri_utils.cc
|
| @@ -4,7 +4,6 @@
|
|
|
| #include "base/android/content_uri_utils.h"
|
|
|
| -#include "base/android/context_utils.h"
|
| #include "base/android/jni_android.h"
|
| #include "base/android/jni_string.h"
|
| #include "jni/ContentUriUtils_jni.h"
|
| @@ -18,16 +17,14 @@ bool ContentUriExists(const FilePath& content_uri) {
|
| JNIEnv* env = base::android::AttachCurrentThread();
|
| ScopedJavaLocalRef<jstring> j_uri =
|
| ConvertUTF8ToJavaString(env, content_uri.value());
|
| - return Java_ContentUriUtils_contentUriExists(
|
| - env, base::android::GetApplicationContext(), j_uri);
|
| + return Java_ContentUriUtils_contentUriExists(env, j_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);
|
| + jint fd = Java_ContentUriUtils_openContentUriForRead(env, j_uri);
|
| if (fd < 0)
|
| return File();
|
| return File(fd);
|
| @@ -37,8 +34,8 @@ std::string GetContentUriMimeType(const FilePath& content_uri) {
|
| JNIEnv* env = base::android::AttachCurrentThread();
|
| ScopedJavaLocalRef<jstring> j_uri =
|
| ConvertUTF8ToJavaString(env, content_uri.value());
|
| - ScopedJavaLocalRef<jstring> j_mime = Java_ContentUriUtils_getMimeType(
|
| - env, base::android::GetApplicationContext(), j_uri);
|
| + ScopedJavaLocalRef<jstring> j_mime =
|
| + Java_ContentUriUtils_getMimeType(env, j_uri);
|
| if (j_mime.is_null())
|
| return std::string();
|
|
|
|
|