| Index: webkit/fileapi/media/native_media_file_util.cc
|
| diff --git a/webkit/fileapi/media/native_media_file_util.cc b/webkit/fileapi/media/native_media_file_util.cc
|
| index 6f7c53c4c97c800092512543a09a0c5b8fd8a782..115278c5b7c617b72ef58d9751b86eb7ed17dfde 100644
|
| --- a/webkit/fileapi/media/native_media_file_util.cc
|
| +++ b/webkit/fileapi/media/native_media_file_util.cc
|
| @@ -31,7 +31,7 @@ PlatformFileError NativeMediaFileUtil::CreateOrOpen(
|
| PlatformFileError NativeMediaFileUtil::EnsureFileExists(
|
| FileSystemOperationContext* context,
|
| const FileSystemURL& url, bool* created) {
|
| - FilePath file_path;
|
| + base::FilePath file_path;
|
| PlatformFileError error = GetFilteredLocalFilePath(context, url, &file_path);
|
| if (error != base::PLATFORM_FILE_OK)
|
| return error;
|
| @@ -55,7 +55,7 @@ PlatformFileError NativeMediaFileUtil::Touch(
|
| const FileSystemURL& url,
|
| const base::Time& last_access_time,
|
| const base::Time& last_modified_time) {
|
| - FilePath file_path;
|
| + base::FilePath file_path;
|
| PlatformFileError error = GetFilteredLocalFilePathForExistingFileOrDirectory(
|
| context,
|
| url,
|
| @@ -71,7 +71,7 @@ PlatformFileError NativeMediaFileUtil::Truncate(
|
| FileSystemOperationContext* context,
|
| const FileSystemURL& url,
|
| int64 length) {
|
| - FilePath file_path;
|
| + base::FilePath file_path;
|
| PlatformFileError error = GetFilteredLocalFilePathForExistingFileOrDirectory(
|
| context,
|
| url,
|
| @@ -88,7 +88,7 @@ PlatformFileError NativeMediaFileUtil::CopyOrMoveFile(
|
| const FileSystemURL& src_url,
|
| const FileSystemURL& dest_url,
|
| bool copy) {
|
| - FilePath src_file_path;
|
| + base::FilePath src_file_path;
|
| PlatformFileError error =
|
| GetFilteredLocalFilePathForExistingFileOrDirectory(
|
| context, src_url,
|
| @@ -99,7 +99,7 @@ PlatformFileError NativeMediaFileUtil::CopyOrMoveFile(
|
| if (NativeFileUtil::DirectoryExists(src_file_path))
|
| return base::PLATFORM_FILE_ERROR_NOT_A_FILE;
|
|
|
| - FilePath dest_file_path;
|
| + base::FilePath dest_file_path;
|
| error = GetLocalFilePath(context, dest_url, &dest_file_path);
|
| if (error != base::PLATFORM_FILE_OK)
|
| return error;
|
| @@ -118,12 +118,12 @@ PlatformFileError NativeMediaFileUtil::CopyOrMoveFile(
|
|
|
| PlatformFileError NativeMediaFileUtil::CopyInForeignFile(
|
| FileSystemOperationContext* context,
|
| - const FilePath& src_file_path,
|
| + const base::FilePath& src_file_path,
|
| const FileSystemURL& dest_url) {
|
| if (src_file_path.empty())
|
| return base::PLATFORM_FILE_ERROR_INVALID_OPERATION;
|
|
|
| - FilePath dest_file_path;
|
| + base::FilePath dest_file_path;
|
| PlatformFileError error =
|
| GetFilteredLocalFilePath(context, dest_url, &dest_file_path);
|
| if (error != base::PLATFORM_FILE_OK)
|
| @@ -134,7 +134,7 @@ PlatformFileError NativeMediaFileUtil::CopyInForeignFile(
|
| PlatformFileError NativeMediaFileUtil::DeleteFile(
|
| FileSystemOperationContext* context,
|
| const FileSystemURL& url) {
|
| - FilePath file_path;
|
| + base::FilePath file_path;
|
| PlatformFileError error = GetLocalFilePath(context, url, &file_path);
|
| if (error != base::PLATFORM_FILE_OK)
|
| return error;
|
| @@ -153,7 +153,7 @@ PlatformFileError NativeMediaFileUtil::GetFileInfo(
|
| FileSystemOperationContext* context,
|
| const FileSystemURL& url,
|
| PlatformFileInfo* file_info,
|
| - FilePath* platform_path) {
|
| + base::FilePath* platform_path) {
|
| DCHECK(context);
|
| DCHECK(context->media_path_filter());
|
| DCHECK(file_info);
|
| @@ -174,8 +174,8 @@ PlatformFileError NativeMediaFileUtil::GetFileInfo(
|
| PlatformFileError NativeMediaFileUtil::GetFilteredLocalFilePath(
|
| FileSystemOperationContext* context,
|
| const FileSystemURL& file_system_url,
|
| - FilePath* local_file_path) {
|
| - FilePath file_path;
|
| + base::FilePath* local_file_path) {
|
| + base::FilePath file_path;
|
| PlatformFileError error =
|
| IsolatedFileUtil::GetLocalFilePath(context, file_system_url, &file_path);
|
| if (error != base::PLATFORM_FILE_OK)
|
| @@ -192,8 +192,8 @@ NativeMediaFileUtil::GetFilteredLocalFilePathForExistingFileOrDirectory(
|
| FileSystemOperationContext* context,
|
| const FileSystemURL& file_system_url,
|
| PlatformFileError failure_error,
|
| - FilePath* local_file_path) {
|
| - FilePath file_path;
|
| + base::FilePath* local_file_path) {
|
| + base::FilePath file_path;
|
| PlatformFileError error =
|
| GetLocalFilePath(context, file_system_url, &file_path);
|
| if (error != base::PLATFORM_FILE_OK)
|
|
|