Revert 108258 - broke Mac LayoutTests.

webkit/fileapi/file_system_file_util_proxy.h

 // Copyright (c) 2011 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_FILE_UTIL_PROXY_H_
 #define WEBKIT_FILEAPI_FILE_SYSTEM_FILE_UTIL_PROXY_H_
 
 #include <vector>
 
 #include "base/callback.h"
@@ skipping 18 matching lines @@
 using base::PlatformFileError;
 using base::PlatformFileInfo;
 
 // This class provides asynchronous access to common file routines for the
 // FileSystem API.
 class FileSystemFileUtilProxy {
  public:
   typedef base::FileUtilProxy::Entry Entry;
 
   typedef base::FileUtilProxy::StatusCallback StatusCallback;
+  typedef base::FileUtilProxy::CreateOrOpenCallback CreateOrOpenCallback;
   typedef base::Callback<void(PlatformFileError,
                               bool /* created */
                               )> EnsureFileExistsCallback;
   typedef base::Callback<void(PlatformFileError,
                               const PlatformFileInfo&,
                               const FilePath& /* platform_path */
                               )> GetFileInfoCallback;
   typedef base::Callback<void(PlatformFileError,
                               const std::vector<Entry>&
                               )> ReadDirectoryCallback;
 
   typedef Callback2<PlatformFileError /* error code */,
                     const FilePath& /* local_path, where possible */
                     >::Type GetLocalPathCallback;
 
+  // Creates or opens a file with the given flags.  It is invalid to pass NULL
+  // for the callback.
+  // If PLATFORM_FILE_CREATE is set in |file_flags| it always tries to create
+  // a new file at the given |file_path| and calls back with
+  // PLATFORM_FILE_ERROR_FILE_EXISTS if the |file_path| already exists.
+  static bool CreateOrOpen(const FileSystemOperationContext& context,
+                           scoped_refptr<MessageLoopProxy> message_loop_proxy,
+                           const FilePath& file_path,
+                           int file_flags,
+                           const CreateOrOpenCallback& callback);
+
+  // Close the given file handle.
+  static bool Close(const FileSystemOperationContext& context,
+                    scoped_refptr<MessageLoopProxy> message_loop_proxy,
+                    PlatformFile,
+                    const StatusCallback& callback);
+
   // Ensures that the given |file_path| exist.  This creates a empty new file
   // at |file_path| if the |file_path| does not exist.
   // If a new file han not existed and is created at the |file_path|,
   // |created| of the callback argument is set true and |error code|
   // is set PLATFORM_FILE_OK.
   // If the file already exists, |created| is set false and |error code|
   // is set PLATFORM_FILE_OK.
   // If the file hasn't existed but it couldn't be created for some other
   // reasons, |created| is set false and |error code| indicates the error.
   static bool EnsureFileExists(
@@ skipping 82 matching lines @@
       int64 length,
       const StatusCallback& callback);
 
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(FileSystemFileUtilProxy);
 };
 
 }  // namespace fileapi
 
 #endif  // WEBKIT_FILEAPI_FILE_SYSTEM_FILE_UTIL_PROXY_H_