Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(457)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/media_galleries/fileapi/itunes_file_util.cc

Issue 145303002: Convert Media Galleries to use base::File (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/media_galleries/fileapi/itunes_file_util.h ('k') | chrome/browser/media_galleries/fileapi/itunes_file_util_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/media_galleries/fileapi/itunes_file_util.cc
diff --git a/chrome/browser/media_galleries/fileapi/itunes_file_util.cc b/chrome/browser/media_galleries/fileapi/itunes_file_util.cc
index b8c45c88dda803862cb753ea9320b9c40f434d31..07371f542a75980ed155b6857a25c20966730bb2 100644
--- a/chrome/browser/media_galleries/fileapi/itunes_file_util.cc
+++ b/chrome/browser/media_galleries/fileapi/itunes_file_util.cc
@@ -27,12 +27,11 @@ namespace itunes {
namespace {
-base::PlatformFileError MakeDirectoryFileInfo(
- base::PlatformFileInfo* file_info) {
- base::PlatformFileInfo result;
+base::File::Error MakeDirectoryFileInfo(base::File::Info* file_info) {
+ base::File::Info result;
result.is_directory = true;
*file_info = result;
- return base::PLATFORM_FILE_OK;
+ return base::File::FILE_OK;
}
} // namespace
@@ -87,10 +86,10 @@ void ITunesFileUtil::CreateSnapshotFileOnTaskRunnerThread(
// /iTunes Media/Automatically Add to iTunes - auto-import directory
// /iTunes Media/Music/<Artist>/<Album>/<Track> - tracks
//
-base::PlatformFileError ITunesFileUtil::GetFileInfoSync(
+base::File::Error ITunesFileUtil::GetFileInfoSync(
fileapi::FileSystemOperationContext* context,
const fileapi::FileSystemURL& url,
- base::PlatformFileInfo* file_info,
+ base::File::Info* file_info,
base::FilePath* platform_path) {
std::vector<std::string> components;
fileapi::VirtualPath::GetComponentsUTF8Unsafe(url.path(), &components);
@@ -109,11 +108,11 @@ base::PlatformFileError ITunesFileUtil::GetFileInfoSync(
}
if (components[0] != kITunesMediaDir)
- return base::PLATFORM_FILE_ERROR_NOT_FOUND;
+ return base::File::FILE_ERROR_NOT_FOUND;
if (components[1] == kITunesAutoAddDir) {
if (GetDataProvider()->auto_add_path().empty())
- return base::PLATFORM_FILE_ERROR_NOT_FOUND;
+ return base::File::FILE_ERROR_NOT_FOUND;
return NativeMediaFileUtil::GetFileInfoSync(context, url, file_info,
platform_path);
}
@@ -146,10 +145,10 @@ base::PlatformFileError ITunesFileUtil::GetFileInfoSync(
}
}
- return base::PLATFORM_FILE_ERROR_NOT_FOUND;
+ return base::File::FILE_ERROR_NOT_FOUND;
}
-base::PlatformFileError ITunesFileUtil::ReadDirectorySync(
+base::File::Error ITunesFileUtil::ReadDirectorySync(
fileapi::FileSystemOperationContext* context,
const fileapi::FileSystemURL& url,
EntryList* file_list) {
@@ -160,21 +159,21 @@ base::PlatformFileError ITunesFileUtil::ReadDirectorySync(
if (components.size() == 0) {
base::File::Info xml_info;
if (!base::GetFileInfo(GetDataProvider()->library_path(), &xml_info))
- return base::PLATFORM_FILE_ERROR_IO;
+ return base::File::FILE_ERROR_IO;
file_list->push_back(DirectoryEntry(kITunesLibraryXML,
DirectoryEntry::FILE,
xml_info.size, xml_info.last_modified));
file_list->push_back(DirectoryEntry(kITunesMediaDir,
DirectoryEntry::DIRECTORY,
0, base::Time()));
- return base::PLATFORM_FILE_OK;
+ return base::File::FILE_OK;
}
if (components.size() == 1 && components[0] == kITunesLibraryXML)
- return base::PLATFORM_FILE_ERROR_NOT_A_DIRECTORY;
+ return base::File::FILE_ERROR_NOT_A_DIRECTORY;
if (components[0] != kITunesMediaDir || components.size() > 5)
- return base::PLATFORM_FILE_ERROR_NOT_FOUND;
+ return base::File::FILE_ERROR_NOT_FOUND;
if (components.size() == 1) {
if (!GetDataProvider()->auto_add_path().empty()) {
@@ -185,7 +184,7 @@ base::PlatformFileError ITunesFileUtil::ReadDirectorySync(
file_list->push_back(DirectoryEntry(kITunesMusicDir,
DirectoryEntry::DIRECTORY,
0, base::Time()));
- return base::PLATFORM_FILE_OK;
+ return base::File::FILE_OK;
}
if (components[1] == kITunesAutoAddDir &&
@@ -194,7 +193,7 @@ base::PlatformFileError ITunesFileUtil::ReadDirectorySync(
}
if (components[1] != kITunesMusicDir)
- return base::PLATFORM_FILE_ERROR_NOT_FOUND;
+ return base::File::FILE_ERROR_NOT_FOUND;
if (components.size() == 2) {
std::set<ITunesDataProvider::ArtistName> artists =
@@ -203,26 +202,26 @@ base::PlatformFileError ITunesFileUtil::ReadDirectorySync(
for (it = artists.begin(); it != artists.end(); ++it)
file_list->push_back(DirectoryEntry(*it, DirectoryEntry::DIRECTORY,
0, base::Time()));
- return base::PLATFORM_FILE_OK;
+ return base::File::FILE_OK;
}
if (components.size() == 3) {
std::set<ITunesDataProvider::AlbumName> albums =
GetDataProvider()->GetAlbumNames(components[2]);
if (albums.size() == 0)
- return base::PLATFORM_FILE_ERROR_NOT_FOUND;
+ return base::File::FILE_ERROR_NOT_FOUND;
std::set<ITunesDataProvider::AlbumName>::const_iterator it;
for (it = albums.begin(); it != albums.end(); ++it)
file_list->push_back(DirectoryEntry(*it, DirectoryEntry::DIRECTORY,
0, base::Time()));
- return base::PLATFORM_FILE_OK;
+ return base::File::FILE_OK;
}
if (components.size() == 4) {
ITunesDataProvider::Album album =
GetDataProvider()->GetAlbum(components[2], components[3]);
if (album.size() == 0)
- return base::PLATFORM_FILE_ERROR_NOT_FOUND;
+ return base::File::FILE_ERROR_NOT_FOUND;
ITunesDataProvider::Album::const_iterator it;
for (it = album.begin(); it != album.end(); ++it) {
base::File::Info file_info;
@@ -233,7 +232,7 @@ base::PlatformFileError ITunesFileUtil::ReadDirectorySync(
file_info.last_modified));
}
}
- return base::PLATFORM_FILE_OK;
+ return base::File::FILE_OK;
}
// At this point, the only choice is one of two errors, but figuring out
@@ -243,26 +242,26 @@ base::PlatformFileError ITunesFileUtil::ReadDirectorySync(
location = GetDataProvider()->GetTrackLocation(components[1], components[2],
components[3]);
if (!location.empty())
- return base::PLATFORM_FILE_ERROR_NOT_A_DIRECTORY;
- return base::PLATFORM_FILE_ERROR_NOT_FOUND;
+ return base::File::FILE_ERROR_NOT_A_DIRECTORY;
+ return base::File::FILE_ERROR_NOT_FOUND;
}
-base::PlatformFileError ITunesFileUtil::DeleteDirectorySync(
+base::File::Error ITunesFileUtil::DeleteDirectorySync(
fileapi::FileSystemOperationContext* context,
const fileapi::FileSystemURL& url) {
- return base::PLATFORM_FILE_ERROR_SECURITY;
+ return base::File::FILE_ERROR_SECURITY;
}
-base::PlatformFileError ITunesFileUtil::DeleteFileSync(
+base::File::Error ITunesFileUtil::DeleteFileSync(
fileapi::FileSystemOperationContext* context,
const fileapi::FileSystemURL& url) {
- return base::PLATFORM_FILE_ERROR_SECURITY;
+ return base::File::FILE_ERROR_SECURITY;
}
-base::PlatformFileError ITunesFileUtil::CreateSnapshotFileSync(
+base::File::Error ITunesFileUtil::CreateSnapshotFileSync(
fileapi::FileSystemOperationContext* context,
const fileapi::FileSystemURL& url,
- base::PlatformFileInfo* file_info,
+ base::File::Info* file_info,
base::FilePath* platform_path,
scoped_refptr<webkit_blob::ShareableFileReference>* file_ref) {
DCHECK(!url.path().IsAbsolute());
@@ -281,7 +280,7 @@ base::PlatformFileError ITunesFileUtil::CreateSnapshotFileSync(
return GetFileInfoSync(context, url, file_info, platform_path);
}
-base::PlatformFileError ITunesFileUtil::GetLocalFilePath(
+base::File::Error ITunesFileUtil::GetLocalFilePath(
fileapi::FileSystemOperationContext* context,
const fileapi::FileSystemURL& url,
base::FilePath* local_file_path) {
@@ -290,35 +289,35 @@ base::PlatformFileError ITunesFileUtil::GetLocalFilePath(
if (components.size() == 1 && components[0] == kITunesLibraryXML) {
*local_file_path = GetDataProvider()->library_path();
- return base::PLATFORM_FILE_OK;
+ return base::File::FILE_OK;
}
if (components.size() >= 2 && components[0] == kITunesMediaDir &&
components[1] == kITunesAutoAddDir) {
*local_file_path = GetDataProvider()->auto_add_path();
if (local_file_path->empty())
- return base::PLATFORM_FILE_ERROR_NOT_FOUND;
+ return base::File::FILE_ERROR_NOT_FOUND;
for (size_t i = 2; i < components.size(); ++i) {
*local_file_path = local_file_path->Append(
base::FilePath::FromUTF8Unsafe(components[i]));
}
- return base::PLATFORM_FILE_OK;
+ return base::File::FILE_OK;
}
// Should only get here for files, i.e. the xml file and tracks.
if (components[0] != kITunesMediaDir || components[1] != kITunesMusicDir||
components.size() != 5) {
- return base::PLATFORM_FILE_ERROR_NOT_FOUND;
+ return base::File::FILE_ERROR_NOT_FOUND;
}
*local_file_path = GetDataProvider()->GetTrackLocation(components[2],
components[3],
components[4]);
if (!local_file_path->empty())
- return base::PLATFORM_FILE_OK;
+ return base::File::FILE_OK;
- return base::PLATFORM_FILE_ERROR_NOT_FOUND;
+ return base::File::FILE_ERROR_NOT_FOUND;
}
void ITunesFileUtil::GetFileInfoWithFreshDataProvider(
@@ -331,8 +330,8 @@ void ITunesFileUtil::GetFileInfoWithFreshDataProvider(
content::BrowserThread::PostTask(
content::BrowserThread::IO,
FROM_HERE,
- base::Bind(callback, base::PLATFORM_FILE_ERROR_IO,
- base::PlatformFileInfo()));
+ base::Bind(callback, base::File::FILE_ERROR_IO,
+ base::File::Info()));
}
return;
}
@@ -350,8 +349,7 @@ void ITunesFileUtil::ReadDirectoryWithFreshDataProvider(
content::BrowserThread::PostTask(
content::BrowserThread::IO,
FROM_HERE,
- base::Bind(callback, base::PLATFORM_FILE_ERROR_IO, EntryList(),
- false));
+ base::Bind(callback, base::File::FILE_ERROR_IO, EntryList(), false));
}
return;
}
@@ -366,13 +364,13 @@ void ITunesFileUtil::CreateSnapshotFileWithFreshDataProvider(
bool valid_parse) {
if (!valid_parse) {
if (!callback.is_null()) {
- base::PlatformFileInfo file_info;
+ base::File::Info file_info;
base::FilePath platform_path;
scoped_refptr<webkit_blob::ShareableFileReference> file_ref;
content::BrowserThread::PostTask(
content::BrowserThread::IO,
FROM_HERE,
- base::Bind(callback, base::PLATFORM_FILE_ERROR_IO, file_info,
+ base::Bind(callback, base::File::FILE_ERROR_IO, file_info,
platform_path, file_ref));
}
return;
« no previous file with comments | « chrome/browser/media_galleries/fileapi/itunes_file_util.h ('k') | chrome/browser/media_galleries/fileapi/itunes_file_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698