FileAPI: Copy base::FileUtilProxy::Entry to fileapi::DirectoryEntry

webkit/fileapi/file_system_operation.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef WEBKIT_FILEAPI_FILE_SYSTEM_OPERATION_H_
 #define WEBKIT_FILEAPI_FILE_SYSTEM_OPERATION_H_
 
 #include <vector>
 
-#include "base/files/file_util_proxy.h"
+#include "base/callback.h"
+#include "base/files/file_path.h"
 #include "base/platform_file.h"
 #include "base/process.h"
 
 namespace base {
 class Time;
 }  // namespace base
 
 namespace net {
 class URLRequestContext;
 }  // namespace net
@@ skipping 25 matching lines @@
 // lifetime of this object and it should be called no more than once.
 //
 // 2) Be self-destructed, or get deleted via base::Owned() after the
 // operation finishes and completion callback is called.
 //
 // 3) Deliver the results of operations to the client via the callback function
 // passed as the last parameter of the method.
 //
 class FileSystemOperation {
  public:
+  // Holds metadata for file or directory entry.

[kinuko, 2013/05/17 02:04:03]

Oops, hiroki, I found this struct is used throughout from browser to renderer
process, and making dependency from renderer to
webkit/fileapi/file_system_operation.h is not great… can you move this to a
separate tiny file (like directory_entry.h) and rename the structure to like:
fileapi::DirectoryEntry ?  (Hopefully other owner's lgtm could be retained for
this minor naming change)

[nhiroki, 2013/05/17 06:12:53]

Done.

+  struct Entry {
+    base::FilePath::StringType name;
+    bool is_directory;
+    int64 size;
+    base::Time last_modified_time;
+  };
+
   virtual ~FileSystemOperation() {}
 
   // Used for CreateFile(), etc. |result| is the return code of the operation.
   typedef base::Callback<void(base::PlatformFileError result)> StatusCallback;
 
   // Used for GetMetadata(). |result| is the return code of the operation,
   // |file_info| is the obtained file info, and |platform_path| is the path
   // of the file.
   typedef base::Callback<
       void(base::PlatformFileError result,
            const base::PlatformFileInfo& file_info,
            const base::FilePath& platform_path)> GetMetadataCallback;
 
   // Used for OpenFile(). |result| is the return code of the operation.
   // |on_close_callback| will be called after the file is closed in the child
   // process.
   typedef base::Callback<
       void(base::PlatformFileError result,
            base::PlatformFile file,
            const base::Closure& on_close_callback,
            base::ProcessHandle peer_handle)> OpenFileCallback;
 
   // Used for ReadDirectoryCallback.
-  typedef std::vector<base::FileUtilProxy::Entry> FileEntryList;
+  typedef std::vector<FileSystemOperation::Entry> FileEntryList;
 
   // Used for ReadDirectory(). |result| is the return code of the operation,
   // |file_list| is the list of files read, and |has_more| is true if some files
   // are yet to be read.
   typedef base::Callback<
       void(base::PlatformFileError result,
            const FileEntryList& file_list,
            bool has_more)> ReadDirectoryCallback;
 
   // Used for CreateSnapshotFile(). (Please see the comment at
@@ skipping 177 matching lines @@
     kOperationOpenFile,
     kOperationCloseFile,
     kOperationGetLocalPath,
     kOperationCancel,
   };
 };
 
 }  // namespace fileapi
 
 #endif  // WEBKIT_FILEAPI_FILE_SYSTEM_OPERATION_H_