Revert "libmojo: Uprev the library to r456626 from Chromium"
This reverts commit 8ac9103e05b66812c25348943383f9365d1ce3e0.
Reason for revert: Broke the mac_sdk
Exempt-From-Owner-Approval: Fixing mac_sdk
Change-Id: I0b74d1abaa66933a93fd6f82ff018e8948c1204e
diff --git a/base/android/path_utils.cc b/base/android/path_utils.cc
index 89ab833..b765449 100644
--- a/base/android/path_utils.cc
+++ b/base/android/path_utils.cc
@@ -17,7 +17,8 @@
bool GetDataDirectory(FilePath* result) {
JNIEnv* env = AttachCurrentThread();
- ScopedJavaLocalRef<jstring> path = Java_PathUtils_getDataDirectory(env);
+ ScopedJavaLocalRef<jstring> path =
+ Java_PathUtils_getDataDirectory(env, GetApplicationContext());
FilePath data_path(ConvertJavaStringToUTF8(path));
*result = data_path;
return true;
@@ -25,7 +26,8 @@
bool GetDatabaseDirectory(FilePath* result) {
JNIEnv* env = AttachCurrentThread();
- ScopedJavaLocalRef<jstring> path = Java_PathUtils_getDatabaseDirectory(env);
+ ScopedJavaLocalRef<jstring> path =
+ Java_PathUtils_getDatabaseDirectory(env, GetApplicationContext());
FilePath data_path(ConvertJavaStringToUTF8(path));
*result = data_path;
return true;
@@ -33,7 +35,8 @@
bool GetCacheDirectory(FilePath* result) {
JNIEnv* env = AttachCurrentThread();
- ScopedJavaLocalRef<jstring> path = Java_PathUtils_getCacheDirectory(env);
+ ScopedJavaLocalRef<jstring> path =
+ Java_PathUtils_getCacheDirectory(env, GetApplicationContext());
FilePath cache_path(ConvertJavaStringToUTF8(path));
*result = cache_path;
return true;
@@ -42,7 +45,7 @@
bool GetThumbnailCacheDirectory(FilePath* result) {
JNIEnv* env = AttachCurrentThread();
ScopedJavaLocalRef<jstring> path =
- Java_PathUtils_getThumbnailCacheDirectory(env);
+ Java_PathUtils_getThumbnailCacheDirectory(env, GetApplicationContext());
FilePath thumbnail_cache_path(ConvertJavaStringToUTF8(path));
*result = thumbnail_cache_path;
return true;
@@ -50,7 +53,8 @@
bool GetDownloadsDirectory(FilePath* result) {
JNIEnv* env = AttachCurrentThread();
- ScopedJavaLocalRef<jstring> path = Java_PathUtils_getDownloadsDirectory(env);
+ ScopedJavaLocalRef<jstring> path =
+ Java_PathUtils_getDownloadsDirectory(env, GetApplicationContext());
FilePath downloads_path(ConvertJavaStringToUTF8(path));
*result = downloads_path;
return true;
@@ -59,7 +63,7 @@
bool GetNativeLibraryDirectory(FilePath* result) {
JNIEnv* env = AttachCurrentThread();
ScopedJavaLocalRef<jstring> path =
- Java_PathUtils_getNativeLibraryDirectory(env);
+ Java_PathUtils_getNativeLibraryDirectory(env, GetApplicationContext());
FilePath library_path(ConvertJavaStringToUTF8(path));
*result = library_path;
return true;
@@ -74,5 +78,9 @@
return true;
}
+bool RegisterPathUtils(JNIEnv* env) {
+ return RegisterNativesImpl(env);
+}
+
} // namespace android
} // namespace base