diff --git a/src/base/files/file_util_android.cc b/src/base/files/file_util_android.cc index 52adc81b78..d2ba684201 100644 --- a/src/base/files/file_util_android.cc +++ b/src/base/files/file_util_android.cc @@ -4,22 +4,10 @@ #include "base/files/file_util.h" -#include "base/android/jni_string.h" #include "base/files/file_path.h" #include "base/path_service.h" -// Must come after all headers that specialize FromJniType() / ToJniType(). -#include "base/base_jni/FileUtils_jni.h" - namespace base { -namespace android { - -static std::string JNI_FileUtils_GetAbsoluteFilePath(JNIEnv* env, - std::string& file_path) { - return MakeAbsoluteFilePath(base::FilePath(file_path)).value(); -} - -} // namespace android bool GetShmemTempDir(bool executable, base::FilePath* path) { return PathService::Get(base::DIR_CACHE, path); diff --git a/src/base/files/file_util_posix.cc b/src/base/files/file_util_posix.cc index 4e275734c4..39a4e7f1aa 100644 --- a/src/base/files/file_util_posix.cc +++ b/src/base/files/file_util_posix.cc @@ -990,7 +990,7 @@ bool GetFileInfo(const FilePath& file_path, File::Info* results) { // Fstat on a virtual content-uri will get size=0 and last_modified=now. // Fix size, and set last_modified=0 to at least make it stable. if (success && results->size == 0) { - int64_t size = GetContentUriFileSize(file_path); + int64_t size = 0; if (size >= 0) { results->size = size; results->last_modified = Time();