Cleanup FileSystemOperation for preparing for adding FSO-factory method

webkit/fileapi/sandbox_mount_point_provider.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_SANDBOX_MOUNT_POINT_PROVIDER_H_
 #define WEBKIT_FILEAPI_SANDBOX_MOUNT_POINT_PROVIDER_H_
 
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 19 matching lines @@
 
 // An interface to construct or crack sandboxed filesystem paths for
 // TEMPORARY or PERSISTENT filesystems, which are placed under the user's
 // profile directory in a sandboxed way.
 // This interface also lets one enumerate and remove storage for the origins
 // that use the filesystem.
 class SandboxMountPointProvider
     : public FileSystemMountPointProvider,
       public FileSystemQuotaUtil {
  public:
-  typedef FileSystemMountPointProvider::GetRootPathCallback GetRootPathCallback;
+  typedef FileSystemMountPointProvider::ValidateFileSystemCallback
+      ValidateFileSystemCallback;
 
   // Origin enumerator interface.
   // An instance of this interface is assumed to be called on the file thread.
   class OriginEnumerator {
    public:
     virtual ~OriginEnumerator() {}
 
     // Returns the next origin.  Returns empty if there are no more origins.
     virtual GURL Next() = 0;
 
     // Returns the current origin's information.
     virtual bool HasFileSystemType(FileSystemType type) const = 0;
   };
 
   // The legacy [pre-obfuscation] FileSystem directory name, kept around for
   // migration and migration testing.
   static const FilePath::CharType kOldFileSystemDirectory[];
   // The FileSystem directory name.
   static const FilePath::CharType kNewFileSystemDirectory[];
   // Where we move the old filesystem directory if migration fails.
   static const FilePath::CharType kRenamedOldFileSystemDirectory[];
 
   SandboxMountPointProvider(
       scoped_refptr<base::MessageLoopProxy> file_message_loop,
       const FilePath& profile_path,
       FileSystemOptions* file_system_options);
   virtual ~SandboxMountPointProvider();
 
   // FileSystemMountPointProvider overrides.
+  virtual void ValidateFileSystemRoot(
+      const GURL& origin_url,
+      FileSystemType type,
+      bool create,
+      const ValidateFileSystemCallback& callback) OVERRIDE;
+  virtual FilePath GetFileSystemRootPathOnFileThread(
+      const GURL& origin_url,
+      FileSystemType type,
+      const FilePath& virtual_path,
+      bool create) OVERRIDE;
   virtual bool IsAccessAllowed(
       const GURL& origin_url,
       FileSystemType type,
       const FilePath& virtual_path) OVERRIDE;
-  virtual void ValidateFileSystemRootAndGetURL(
-      const GURL& origin_url,
-      FileSystemType type,
-      bool create,
-      const GetRootPathCallback& callback) OVERRIDE;
-  virtual FilePath ValidateFileSystemRootAndGetPathOnFileThread(
-      const GURL& origin_url,
-      FileSystemType type,
-      const FilePath& unused,
-      bool create) OVERRIDE;
   virtual bool IsRestrictedFileName(const FilePath& filename) const OVERRIDE;
   virtual std::vector<FilePath> GetRootDirectories() const OVERRIDE;
   virtual FileSystemFileUtil* GetFileUtil() OVERRIDE;
 
   FilePath old_base_path() const;
   FilePath new_base_path() const;
   FilePath renamed_old_base_path() const;
 
   // Returns an origin enumerator of this provider.
   // This method can only be called on the file thread.
@@ skipping 54 matching lines @@
       const GURL& origin_url,
       FileSystemType type) const;
 
   FilePath OldCreateFileSystemRootPath(
       const GURL& origin_url, FileSystemType type);
 
   // Returns true if the given |url|'s scheme is allowed to access
   // filesystem.
   bool IsAllowedScheme(const GURL& url) const;
 
-  class GetFileSystemRootPathTask;
-
   friend class FileSystemTestOriginHelper;
   friend class SandboxMountPointProviderMigrationTest;
   friend class SandboxMountPointProviderOriginEnumeratorTest;
 
   scoped_refptr<base::MessageLoopProxy> file_message_loop_;
 
   const FilePath profile_path_;
 
   scoped_ptr<FileSystemOptions> file_system_options_;
 
   scoped_refptr<ObfuscatedFileUtil> sandbox_file_util_;
 
   // Acccessed only on the file thread.
   std::set<GURL> visited_origins_;
 
   DISALLOW_COPY_AND_ASSIGN(SandboxMountPointProvider);
 };
 
 }  // namespace fileapi
 
 #endif  // WEBKIT_FILEAPI_SANDBOX_MOUNT_POINT_PROVIDER_H_