Cleanup FileSystemOperation for preparing for adding FSO-factory method

webkit/chromeos/fileapi/cros_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_CHROMEOS_FILEAPI_CROS_MOUNT_POINT_PROVIDER_H_
 #define WEBKIT_CHROMEOS_FILEAPI_CROS_MOUNT_POINT_PROVIDER_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 10 matching lines @@
 }
 
 namespace chromeos {
 
 class FileAccessPermissions;
 
 // An interface to provide local filesystem paths.
 class CrosMountPointProvider
     : public fileapi::ExternalFileSystemMountPointProvider {
  public:
-  typedef fileapi::FileSystemMountPointProvider::GetRootPathCallback
-      GetRootPathCallback;
+  typedef fileapi::FileSystemMountPointProvider::ValidateFileSystemCallback
+      ValidateFileSystemCallback;
 
   CrosMountPointProvider(
       scoped_refptr<quota::SpecialStoragePolicy> special_storage_policy);
   virtual ~CrosMountPointProvider();
 
   // fileapi::FileSystemMountPointProvider overrides.
-  virtual bool IsAccessAllowed(const GURL& origin_url,
-                               fileapi::FileSystemType type,
-                               const FilePath& virtual_path) OVERRIDE;
-  virtual void ValidateFileSystemRootAndGetURL(
+  virtual void ValidateFileSystemRoot(
       const GURL& origin_url,
       fileapi::FileSystemType type,
       bool create,
-      const GetRootPathCallback& callback)
-          OVERRIDE;
-  virtual FilePath ValidateFileSystemRootAndGetPathOnFileThread(
+      const ValidateFileSystemCallback& callback) OVERRIDE;
+  virtual FilePath GetFileSystemRootPathOnFileThread(
       const GURL& origin_url,
       fileapi::FileSystemType type,
       const FilePath& virtual_path,
       bool create) OVERRIDE;
+  virtual bool IsAccessAllowed(
+      const GURL& origin_url,
+      fileapi::FileSystemType type,
+      const FilePath& virtual_path) OVERRIDE;
   virtual bool IsRestrictedFileName(const FilePath& filename) const OVERRIDE;
   virtual std::vector<FilePath> GetRootDirectories() const OVERRIDE;
   virtual fileapi::FileSystemFileUtil* GetFileUtil() OVERRIDE;
 
   // fileapi::ExternalFileSystemMountPointProvider overrides.
   virtual void GrantFullAccessToExtension(
       const std::string& extension_id) OVERRIDE;
   virtual void GrantFileAccessToExtension(
       const std::string& extension_id, const FilePath& virtual_path) OVERRIDE;
   virtual void RevokeAccessForExtension(
@@ skipping 15 matching lines @@
   MountPointMap mount_point_map_;
   scoped_refptr<quota::SpecialStoragePolicy> special_storage_policy_;
   scoped_ptr<FileAccessPermissions> file_access_permissions_;
   scoped_ptr<fileapi::LocalFileUtil> local_file_util_;
   DISALLOW_COPY_AND_ASSIGN(CrosMountPointProvider);
 };
 
 }  // namespace chromeos
 
 #endif  // WEBKIT_CHROMEOS_FILEAPI_CROS_MOUNT_POINT_PROVIDER_H_