Cleanup FileSystemOperation for preparing for adding FSO-factory method

webkit/fileapi/sandbox_mount_point_provider.h

Index: webkit/fileapi/sandbox_mount_point_provider.h
diff --git a/webkit/fileapi/sandbox_mount_point_provider.h b/webkit/fileapi/sandbox_mount_point_provider.h
index e7db7b973dd3c2b147ada228a4a7329ec9ac057a..2ee584e7a974f9fc597987b98f25a553d7e59d34 100644
--- a/webkit/fileapi/sandbox_mount_point_provider.h
+++ b/webkit/fileapi/sandbox_mount_point_provider.h
@@ -37,7 +37,8 @@ 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.
@@ -67,20 +68,20 @@ class SandboxMountPointProvider
   virtual ~SandboxMountPointProvider();
 
   // FileSystemMountPointProvider overrides.
-  virtual bool IsAccessAllowed(
-      const GURL& origin_url,
-      FileSystemType type,
-      const FilePath& virtual_path) OVERRIDE;
-  virtual void ValidateFileSystemRootAndGetURL(
+  virtual void ValidateFileSystemRoot(
       const GURL& origin_url,
       FileSystemType type,
       bool create,
-      const GetRootPathCallback& callback) OVERRIDE;
-  virtual FilePath ValidateFileSystemRootAndGetPathOnFileThread(
+      const ValidateFileSystemCallback& callback) OVERRIDE;
+  virtual FilePath GetFileSystemRootPathOnFileThread(
       const GURL& origin_url,
       FileSystemType type,
-      const FilePath& unused,
+      const FilePath& virtual_path,
       bool create) OVERRIDE;
+  virtual bool IsAccessAllowed(
+      const GURL& origin_url,
+      FileSystemType type,
+      const FilePath& virtual_path) OVERRIDE;
   virtual bool IsRestrictedFileName(const FilePath& filename) const OVERRIDE;
   virtual std::vector<FilePath> GetRootDirectories() const OVERRIDE;
   virtual FileSystemFileUtil* GetFileUtil() OVERRIDE;
@@ -155,8 +156,6 @@ class SandboxMountPointProvider
   // filesystem.
   bool IsAllowedScheme(const GURL& url) const;
 
-  class GetFileSystemRootPathTask;
-
   friend class FileSystemTestOriginHelper;
   friend class SandboxMountPointProviderMigrationTest;
   friend class SandboxMountPointProviderOriginEnumeratorTest;