Convert Media Galleries to use base::File

Unfortunately, this brings in changes to webkit/browser/fileapi, and once
that changes, a lot of files have to be updated.

The bright side is that most of the collateral changes are just trivial
renaming of PlatformFileError -> File::Error and PlatformFileInfo ->
File::Info

BUG=322664

Review URL: https://codereview.chromium.org/145303002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247301 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 38 insertions, 39 deletions

diff --git a/content/child/fileapi/file_system_dispatcher.cc b/content/child/fileapi/file_system_dispatcher.cc
index 3abc6fc..d6c6303 100644
--- a/content/child/fileapi/file_system_dispatcher.cc
+++ b/content/child/fileapi/file_system_dispatcher.cc
@@ -77,20 +77,20 @@ class FileSystemDispatcher::CallbackDispatcher {
   ~CallbackDispatcher() {}
 
   void DidSucceed() {
-    status_callback_.Run(base::PLATFORM_FILE_OK);
+    status_callback_.Run(base::File::FILE_OK);
   }
 
-  void DidFail(base::PlatformFileError error_code) {
+  void DidFail(base::File::Error error_code) {
     error_callback_.Run(error_code);
   }
 
   void DidReadMetadata(
-      const base::PlatformFileInfo& file_info) {
+      const base::File::Info& file_info) {
     metadata_callback_.Run(file_info);
   }
 
   void DidCreateSnapshotFile(
-      const base::PlatformFileInfo& file_info,
+      const base::File::Info& file_info,
       const base::FilePath& platform_path,
       int request_id) {
     snapshot_callback_.Run(file_info, platform_path, request_id);
@@ -150,7 +150,7 @@ FileSystemDispatcher::~FileSystemDispatcher() {
     int request_id = iter.GetCurrentKey();
     CallbackDispatcher* dispatcher = iter.GetCurrentValue();
     DCHECK(dispatcher);
-    dispatcher->DidFail(base::PLATFORM_FILE_ERROR_ABORT);
+    dispatcher->DidFail(base::File::FILE_ERROR_ABORT);
     dispatchers_.Remove(request_id);
   }
 }
@@ -367,7 +367,7 @@ void FileSystemDispatcher::OnDidSucceed(int request_id) {
 }
 
 void FileSystemDispatcher::OnDidReadMetadata(
-    int request_id, const base::PlatformFileInfo& file_info) {
+    int request_id, const base::File::Info& file_info) {
   CallbackDispatcher* dispatcher = dispatchers_.Lookup(request_id);
   DCHECK(dispatcher);
   dispatcher->DidReadMetadata(file_info);
@@ -375,7 +375,7 @@ void FileSystemDispatcher::OnDidReadMetadata(
 }
 
 void FileSystemDispatcher::OnDidCreateSnapshotFile(
-    int request_id, const base::PlatformFileInfo& file_info,
+    int request_id, const base::File::Info& file_info,
     const base::FilePath& platform_path) {
   CallbackDispatcher* dispatcher = dispatchers_.Lookup(request_id);
   DCHECK(dispatcher);
@@ -394,7 +394,7 @@ void FileSystemDispatcher::OnDidReadDirectory(
 }
 
 void FileSystemDispatcher::OnDidFail(
-    int request_id, base::PlatformFileError error_code) {
+    int request_id, base::File::Error error_code) {
   CallbackDispatcher* dispatcher = dispatchers_.Lookup(request_id);
   DCHECK(dispatcher);
   dispatcher->DidFail(error_code);
diff --git a/content/child/fileapi/file_system_dispatcher.h b/content/child/fileapi/file_system_dispatcher.h
index b3d427f..6d098b6 100644
--- a/content/child/fileapi/file_system_dispatcher.h
+++ b/content/child/fileapi/file_system_dispatcher.h
@@ -19,7 +19,6 @@
 
 namespace base {
 class FilePath;
-struct PlatformFileInfo;
 }
 
 namespace fileapi {
@@ -36,11 +35,11 @@ namespace content {
 // per child process.  Messages are dispatched on the main child thread.
 class FileSystemDispatcher : public IPC::Listener {
  public:
-  typedef base::Callback<void(base::PlatformFileError error)> StatusCallback;
+  typedef base::Callback<void(base::File::Error error)> StatusCallback;
   typedef base::Callback<void(
-      const base::PlatformFileInfo& file_info)> MetadataCallback;
+      const base::File::Info& file_info)> MetadataCallback;
   typedef base::Callback<void(
-      const base::PlatformFileInfo& file_info,
+      const base::File::Info& file_info,
       const base::FilePath& platform_path,
       int request_id)> CreateSnapshotFileCallback;
   typedef base::Callback<void(
@@ -139,14 +138,14 @@ class FileSystemDispatcher : public IPC::Listener {
                        bool is_directory);
   void OnDidSucceed(int request_id);
   void OnDidReadMetadata(int request_id,
-                         const base::PlatformFileInfo& file_info);
+                         const base::File::Info& file_info);
   void OnDidCreateSnapshotFile(int request_id,
-                               const base::PlatformFileInfo& file_info,
+                               const base::File::Info& file_info,
                                const base::FilePath& platform_path);
   void OnDidReadDirectory(int request_id,
                           const std::vector<fileapi::DirectoryEntry>& entries,
                           bool has_more);
-  void OnDidFail(int request_id, base::PlatformFileError error_code);
+  void OnDidFail(int request_id, base::File::Error error_code);
   void OnDidWrite(int request_id, int64 bytes, bool complete);
   void OnDidOpenFile(
       int request_id,
diff --git a/content/child/fileapi/webfilesystem_impl.cc b/content/child/fileapi/webfilesystem_impl.cc
index 59e9d56..902c12d 100644
--- a/content/child/fileapi/webfilesystem_impl.cc
+++ b/content/child/fileapi/webfilesystem_impl.cc
@@ -171,8 +171,8 @@ void ResolveURLCallbackAdapter(
 
 void StatusCallbackAdapter(int thread_id, int callbacks_id,
                            WaitableCallbackResults* waitable_results,
-                           base::PlatformFileError error) {
-  if (error == base::PLATFORM_FILE_OK) {
+                           base::File::Error error) {
+  if (error == base::File::FILE_OK) {
     CallbackFileSystemCallbacks(
         thread_id, callbacks_id, waitable_results,
         &WebFileSystemCallbacks::didSucceed, MakeTuple());
@@ -180,15 +180,15 @@ void StatusCallbackAdapter(int thread_id, int callbacks_id,
     CallbackFileSystemCallbacks(
         thread_id, callbacks_id, waitable_results,
         &WebFileSystemCallbacks::didFail,
-        MakeTuple(fileapi::PlatformFileErrorToWebFileError(error)));
+        MakeTuple(fileapi::FileErrorToWebFileError(error)));
   }
 }
 
 void ReadMetadataCallbackAdapter(int thread_id, int callbacks_id,
                                  WaitableCallbackResults* waitable_results,
-                                 const base::PlatformFileInfo& file_info) {
+                                 const base::File::Info& file_info) {
   WebFileInfo web_file_info;
-  webkit_glue::PlatformFileInfoToWebFileInfo(file_info, &web_file_info);
+  webkit_glue::FileInfoToWebFileInfo(file_info, &web_file_info);
   CallbackFileSystemCallbacks(
       thread_id, callbacks_id, waitable_results,
       &WebFileSystemCallbacks::didReadMetadata,
@@ -216,7 +216,7 @@ void DidCreateFileWriter(
     const GURL& path,
     blink::WebFileWriterClient* client,
     base::MessageLoopProxy* main_thread_loop,
-    const base::PlatformFileInfo& file_info) {
+    const base::File::Info& file_info) {
   WebFileSystemImpl* filesystem =
       WebFileSystemImpl::ThreadSpecificInstance(NULL);
   if (!filesystem)
@@ -243,7 +243,7 @@ void CreateFileWriterCallbackAdapter(
     base::MessageLoopProxy* main_thread_loop,
     const GURL& path,
     blink::WebFileWriterClient* client,
-    const base::PlatformFileInfo& file_info) {
+    const base::File::Info& file_info) {
   DispatchResultsClosure(
       thread_id, callbacks_id, waitable_results,
       base::Bind(&DidCreateFileWriter, callbacks_id, path, client,
@@ -253,7 +253,7 @@ void CreateFileWriterCallbackAdapter(
 void DidCreateSnapshotFile(
     int callbacks_id,
     base::MessageLoopProxy* main_thread_loop,
-    const base::PlatformFileInfo& file_info,
+    const base::File::Info& file_info,
     const base::FilePath& platform_path,
     int request_id) {
   WebFileSystemImpl* filesystem =
@@ -265,7 +265,7 @@ void DidCreateSnapshotFile(
       filesystem->GetAndUnregisterCallbacks(callbacks_id);
 
   WebFileInfo web_file_info;
-  webkit_glue::PlatformFileInfoToWebFileInfo(file_info, &web_file_info);
+  webkit_glue::FileInfoToWebFileInfo(file_info, &web_file_info);
   web_file_info.platformPath = platform_path.AsUTF16Unsafe();
   callbacks.didCreateSnapshotFile(web_file_info);
 
@@ -279,7 +279,7 @@ void CreateSnapshotFileCallbackAdapter(
     int thread_id, int callbacks_id,
     WaitableCallbackResults* waitable_results,
     base::MessageLoopProxy* main_thread_loop,
-    const base::PlatformFileInfo& file_info,
+    const base::File::Info& file_info,
     const base::FilePath& platform_path,
     int request_id) {
   DispatchResultsClosure(
diff --git a/content/child/fileapi/webfilewriter_base.cc b/content/child/fileapi/webfilewriter_base.cc
index cde644b..a0ede79 100644
--- a/content/child/fileapi/webfilewriter_base.cc
+++ b/content/child/fileapi/webfilewriter_base.cc
@@ -10,7 +10,7 @@
 #include "third_party/WebKit/public/platform/WebURL.h"
 #include "webkit/common/fileapi/file_system_util.h"
 
-using fileapi::PlatformFileErrorToWebFileError;
+using fileapi::FileErrorToWebFileError;
 
 namespace content {
 
@@ -63,8 +63,8 @@ void WebFileWriterBase::cancel() {
   DoCancel();
 }
 
-void WebFileWriterBase::DidFinish(base::PlatformFileError error_code) {
-  if (error_code == base::PLATFORM_FILE_OK)
+void WebFileWriterBase::DidFinish(base::File::Error error_code) {
+  if (error_code == base::File::FILE_OK)
     DidSucceed();
   else
     DidFail(error_code);
@@ -117,13 +117,13 @@ void WebFileWriterBase::DidSucceed() {
   }
 }
 
-void WebFileWriterBase::DidFail(base::PlatformFileError error_code) {
+void WebFileWriterBase::DidFail(base::File::Error error_code) {
   DCHECK(kOperationNone != operation_);
   switch (cancel_state_) {
     case kCancelNotInProgress:
       // A write or truncate failed.
       operation_ = kOperationNone;
-      client_->didFail(PlatformFileErrorToWebFileError(error_code));
+      client_->didFail(FileErrorToWebFileError(error_code));
       break;
     case kCancelSent:
       // This is the failure of a write or truncate; the next message should be
diff --git a/content/child/fileapi/webfilewriter_base.h b/content/child/fileapi/webfilewriter_base.h
index 5168e3c..7371e63 100644
--- a/content/child/fileapi/webfilewriter_base.h
+++ b/content/child/fileapi/webfilewriter_base.h
@@ -5,7 +5,7 @@
 #ifndef CONTENT_CHILD_FILEAPI_WEBFILEWRITER_BASE_H_
 #define CONTENT_CHILD_FILEAPI_WEBFILEWRITER_BASE_H_
 
-#include "base/platform_file.h"
+#include "base/files/file.h"
 #include "content/common/content_export.h"
 #include "third_party/WebKit/public/platform/WebFileWriter.h"
 #include "url/gurl.h"
@@ -30,11 +30,11 @@ class CONTENT_EXPORT WebFileWriterBase
 
  protected:
   // This calls DidSucceed() or DidFail() based on the value of |error_code|.
-  void DidFinish(base::PlatformFileError error_code);
+  void DidFinish(base::File::Error error_code);
 
   void DidWrite(int64 bytes, bool complete);
   void DidSucceed();
-  void DidFail(base::PlatformFileError error_code);
+  void DidFail(base::File::Error error_code);
 
   // Derived classes must provide these methods to asynchronously perform
   // the requested operation, and they must call the appropiate DidSomething
diff --git a/content/child/fileapi/webfilewriter_base_unittest.cc b/content/child/fileapi/webfilewriter_base_unittest.cc
index 95e0ba5..1c3448a 100644
--- a/content/child/fileapi/webfilewriter_base_unittest.cc
+++ b/content/child/fileapi/webfilewriter_base_unittest.cc
@@ -73,14 +73,14 @@ class TestableFileWriter : public WebFileWriterBase {
     if (offset == kBasicFileTruncate_Offset) {
       DidSucceed();
     } else if (offset == kErrorFileTruncate_Offset) {
-      DidFail(base::PLATFORM_FILE_ERROR_NOT_FOUND);
+      DidFail(base::File::FILE_ERROR_NOT_FOUND);
     } else if (offset == kCancelFileTruncate_Offset) {
       cancel();
       DidSucceed();  // truncate completion
       DidSucceed();  // cancel completion
     } else if (offset == kCancelFailedTruncate_Offset) {
       cancel();
-      DidFail(base::PLATFORM_FILE_ERROR_NOT_FOUND);  // truncate completion
+      DidFail(base::File::FILE_ERROR_NOT_FOUND);  // truncate completion
       DidSucceed();  // cancel completion
     } else {
       FAIL();
@@ -98,7 +98,7 @@ class TestableFileWriter : public WebFileWriterBase {
     if (offset == kBasicFileWrite_Offset) {
       DidWrite(1, true);
     } else if (offset == kErrorFileWrite_Offset) {
-      DidFail(base::PLATFORM_FILE_ERROR_NOT_FOUND);
+      DidFail(base::File::FILE_ERROR_NOT_FOUND);
     } else if (offset == kMultiFileWrite_Offset) {
       DidWrite(1, false);
       DidWrite(1, false);
@@ -108,7 +108,7 @@ class TestableFileWriter : public WebFileWriterBase {
       cancel();
       DidWrite(1, false);
       DidWrite(1, false);
-      DidFail(base::PLATFORM_FILE_ERROR_FAILED);  // write completion
+      DidFail(base::File::FILE_ERROR_FAILED);  // write completion
       DidSucceed();  // cancel completion
     } else if (offset == kCancelFileWriteAfterCompletion_Offset) {
       DidWrite(1, false);
@@ -116,7 +116,7 @@ class TestableFileWriter : public WebFileWriterBase {
       DidWrite(1, false);
       DidWrite(1, false);
       DidWrite(1, true);  // write completion
-      DidFail(base::PLATFORM_FILE_ERROR_FAILED);  // cancel completion
+      DidFail(base::File::FILE_ERROR_FAILED);  // cancel completion
     } else {
       FAIL();
     }
diff --git a/content/child/fileapi/webfilewriter_impl.cc b/content/child/fileapi/webfilewriter_impl.cc
index 7077e9a..d93289f 100644
--- a/content/child/fileapi/webfilewriter_impl.cc
+++ b/content/child/fileapi/webfilewriter_impl.cc
@@ -93,7 +93,7 @@ class WebFileWriterImpl::WriterBridge
     PostTaskToWorker(base::Bind(write_callback_, written_bytes_, complete));
   }
 
-  void DidFinish(base::PlatformFileError status) {
+  void DidFinish(base::File::Error status) {
     PostTaskToWorker(base::Bind(status_callback_, status));
   }