Revert 108258 - broke Mac LayoutTests.

base/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 BASE_FILE_UTIL_PROXY_H_
 #define BASE_FILE_UTIL_PROXY_H_
 
 #include <vector>
 
 #include "base/base_export.h"
@@ skipping 14 matching lines @@
  public:
   // Holds metadata for file or directory entry.
   struct Entry {
     FilePath::StringType name;
     bool is_directory;
     int64 size;
     base::Time last_modified_time;
   };
 
   // This callback is used by methods that report only an error code.  It is
-  // valid to pass a null callback to any function that takes a StatusCallback,
+  // valid to pass StatusCallback() to any function that takes a StatusCallback,
   // in which case the operation will complete silently.
   typedef Callback<void(PlatformFileError)> StatusCallback;
 
   typedef Callback<void(PlatformFileError,
                         PassPlatformFile,
                         bool /* created */)> CreateOrOpenCallback;
   typedef Callback<void(PlatformFileError,
                         PassPlatformFile,
                         FilePath)> CreateTemporaryCallback;
   typedef Callback<void(PlatformFileError,
                         const PlatformFileInfo&
                        )> GetFileInfoCallback;
   typedef Callback<void(PlatformFileError,
                         const char* /* data */,
                         int /* bytes read */)> ReadCallback;
   typedef Callback<void(PlatformFileError,
                         int /* bytes written */)> WriteCallback;
 
-  typedef Callback<PlatformFileError(PlatformFile*, bool*)> CreateOrOpenTask;
-  typedef Callback<PlatformFileError(PlatformFile)> CloseTask;
-
   // Creates or opens a file with the given flags. It is invalid to pass a null
   // 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(scoped_refptr<MessageLoopProxy> message_loop_proxy,
                            const FilePath& file_path,
                            int file_flags,
                            const CreateOrOpenCallback& callback);
 
   // Creates a temporary file for writing. The path and an open file handle are
@@ skipping 93 matching lines @@
       const FilePath& path,
       int64 length,
       const StatusCallback& callback);
 
   // Flushes a file. The callback can be null.
   static bool Flush(
       scoped_refptr<MessageLoopProxy> message_loop_proxy,
       PlatformFile file,
       const StatusCallback& callback);
 
-  // Relay helpers.
-  static bool RelayCreateOrOpen(
-      scoped_refptr<MessageLoopProxy> message_loop_proxy,
-      const CreateOrOpenTask& open_task,
-      const CloseTask& close_task,
-      const CreateOrOpenCallback& callback);
-
-  static bool RelayClose(
-      scoped_refptr<MessageLoopProxy> message_loop_proxy,
-      const CloseTask& close_task,
-      PlatformFile,
-      const StatusCallback& callback);
-
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(FileUtilProxy);
 };
 
 }  // namespace base
 
 #endif  // BASE_FILE_UTIL_PROXY_H_