fileapi: Rename FileSystemMountProvider to FileSystemBackend

webkit/browser/fileapi/file_system_context.h

Index: webkit/browser/fileapi/file_system_context.h
diff --git a/webkit/browser/fileapi/file_system_context.h b/webkit/browser/fileapi/file_system_context.h
index 21d48be36630dc3c52de8de9e29cbd957bd6cf43..be293b90a7803728519971e0f319f863d5c7d100 100644
--- a/webkit/browser/fileapi/file_system_context.h
+++ b/webkit/browser/fileapi/file_system_context.h
@@ -48,20 +48,20 @@ namespace fileapi {
 
 class AsyncFileUtil;
 class CopyOrMoveFileValidatorFactory;
-class ExternalFileSystemMountPointProvider;
+class ExternalFileSystemBackend;
 class ExternalMountPoints;
 class FileStreamWriter;
 class FileSystemFileUtil;
-class FileSystemMountPointProvider;
+class FileSystemBackend;
 class FileSystemOperation;
 class FileSystemOperationRunner;
 class FileSystemOptions;
 class FileSystemQuotaUtil;
 class FileSystemTaskRunners;
 class FileSystemURL;
-class IsolatedMountPointProvider;
+class IsolatedFileSystemBackend;
 class MountPoints;
-class SandboxMountPointProvider;
+class SandboxFileSystemBackend;
 
 struct DefaultContextDeleter;
 
@@ -80,7 +80,7 @@ class WEBKIT_STORAGE_BROWSER_EXPORT FileSystemContext
   static int GetPermissionPolicy(FileSystemType type);
 
   // task_runners->file_task_runner() is used as default TaskRunner.
-  // Unless a MountPointProvider is overridden in CreateFileSystemOperation,
+  // Unless a FileSystemBackend is overridden in CreateFileSystemOperation,
   // it is used for all file operations and file related meta operations.
   // The code assumes that
   // task_runners->file_task_runner()->RunsTasksOnCurrentThread()
@@ -88,12 +88,11 @@ class WEBKIT_STORAGE_BROWSER_EXPORT FileSystemContext
   // blocking file operations (like SequencedWorkerPool implementation does).
   //
   // |external_mount_points| contains non-system external mount points available
-  // in the context. If not NULL, it will be used during URL cracking. On
-  // ChromeOS, it will be passed to external_mount_point_provider.
+  // in the context. If not NULL, it will be used during URL cracking.
   // |external_mount_points| may be NULL only on platforms different from
   // ChromeOS (i.e. platforms that don't use external_mount_point_provider).
   //
-  // |additional_providers| are added to the internal provider map
+  // |additional_backends| are added to the internal backend map
   // to serve filesystem requests for non-regular types.
   // If none is given, this context only handles HTML5 Sandbox FileSystem
   // and Drag-and-drop Isolated FileSystem requests.
@@ -102,7 +101,7 @@ class WEBKIT_STORAGE_BROWSER_EXPORT FileSystemContext
       ExternalMountPoints* external_mount_points,
       quota::SpecialStoragePolicy* special_storage_policy,
       quota::QuotaManagerProxy* quota_manager_proxy,
-      ScopedVector<FileSystemMountPointProvider> additional_providers,
+      ScopedVector<FileSystemBackend> additional_backends,
       const base::FilePath& partition_path,
       const FileSystemOptions& options);
 
@@ -131,10 +130,10 @@ class WEBKIT_STORAGE_BROWSER_EXPORT FileSystemContext
   CopyOrMoveFileValidatorFactory* GetCopyOrMoveFileValidatorFactory(
       FileSystemType type, base::PlatformFileError* error_code) const;
 
-  // Returns the mount point provider instance for the given |type|.
+  // Returns the file system backend instance for the given |type|.
   // This may return NULL if it is given an invalid or unsupported filesystem
   // type.
-  FileSystemMountPointProvider* GetMountPointProvider(
+  FileSystemBackend* GetFileSystemBackend(
       FileSystemType type) const;
 
   // Returns true for sandboxed filesystems. Currently this does
@@ -150,10 +149,10 @@ class WEBKIT_STORAGE_BROWSER_EXPORT FileSystemContext
   // Returns all registered filesystem types.
   void GetFileSystemTypes(std::vector<FileSystemType>* types) const;
 
-  // Returns a FileSystemMountPointProvider instance for external filesystem
+  // Returns a FileSystemBackend instance for external filesystem
   // type, which is used only by chromeos for now.  This is equivalent to
-  // calling GetMountPointProvider(kFileSystemTypeExternal).
-  ExternalFileSystemMountPointProvider* external_provider() const;
+  // calling GetFileSystemBackend(kFileSystemTypeExternal).
+  ExternalFileSystemBackend* external_backend() const;
 
   // Used for OpenFileSystem.
   typedef base::Callback<void(base::PlatformFileError result,
@@ -189,8 +188,8 @@ class WEBKIT_STORAGE_BROWSER_EXPORT FileSystemContext
   // the file has been modified, and if it does any succeeding read operations
   // should fail with ERR_UPLOAD_FILE_CHANGED error.
   // This method internally cracks the |url|, get an appropriate
-  // MountPointProvider for the URL and call the provider's CreateFileReader.
-  // The resolved MountPointProvider could perform further specialization
+  // FileSystemBackend for the URL and call the backend's CreateFileReader.
+  // The resolved FileSystemBackend could perform further specialization
   // depending on the filesystem type pointed by the |url|.
   scoped_ptr<webkit_blob::FileStreamReader> CreateFileStreamReader(
       const FileSystemURL& url,
@@ -236,13 +235,13 @@ class WEBKIT_STORAGE_BROWSER_EXPORT FileSystemContext
 #endif
 
  private:
-  typedef std::map<FileSystemType, FileSystemMountPointProvider*>
-      MountPointProviderMap;
+  typedef std::map<FileSystemType, FileSystemBackend*>
+      FileSystemBackendMap;
 
   // For CreateFileSystemOperation.
   friend class FileSystemOperationRunner;
 
-  // For sandbox_provider().
+  // For sandbox_backend().
   friend class SandboxFileSystemTestHelper;
 
   // Deleters.
@@ -255,9 +254,9 @@ class WEBKIT_STORAGE_BROWSER_EXPORT FileSystemContext
   void DeleteOnCorrectThread() const;
 
   // Creates a new FileSystemOperation instance by getting an appropriate
-  // MountPointProvider for |url| and calling the provider's corresponding
+  // FileSystemBackend for |url| and calling the backend's corresponding
   // CreateFileSystemOperation method.
-  // The resolved MountPointProvider could perform further specialization
+  // The resolved FileSystemBackend could perform further specialization
   // depending on the filesystem type pointed by the |url|.
   //
   // Called by FileSystemOperationRunner.
@@ -274,33 +273,33 @@ class WEBKIT_STORAGE_BROWSER_EXPORT FileSystemContext
   // returns the original url, without attempting to crack it.
   FileSystemURL CrackFileSystemURL(const FileSystemURL& url) const;
 
-  // For initial provider_map construction. This must be called only from
+  // For initial backend_map construction. This must be called only from
   // the constructor.
-  void RegisterMountPointProvider(FileSystemMountPointProvider* provider);
+  void RegisterBackend(FileSystemBackend* backend);
 
-  // Returns a FileSystemMountPointProvider, used only by test code.
-  SandboxMountPointProvider* sandbox_provider() const {
-    return sandbox_provider_.get();
+  // Returns a FileSystemBackend, used only by test code.
+  SandboxFileSystemBackend* sandbox_backend() const {
+    return sandbox_backend_.get();
   }
 
   scoped_ptr<FileSystemTaskRunners> task_runners_;
 
   scoped_refptr<quota::QuotaManagerProxy> quota_manager_proxy_;
 
-  // Regular mount point providers.
-  scoped_ptr<SandboxMountPointProvider> sandbox_provider_;
-  scoped_ptr<IsolatedMountPointProvider> isolated_provider_;
+  // Regular file system backends.
+  scoped_ptr<SandboxFileSystemBackend> sandbox_backend_;
+  scoped_ptr<IsolatedFileSystemBackend> isolated_backend_;
 
-  // Additional mount point providers.
-  ScopedVector<FileSystemMountPointProvider> additional_providers_;
+  // Additional file system backends.
+  ScopedVector<FileSystemBackend> additional_backends_;
 
-  // Registered mount point providers.
+  // Registered file system backends.
   // The map must be constructed in the constructor since it can be accessed
   // on multiple threads.
-  // This map itself doesn't retain each provider's ownership; ownerships
-  // of the providers are held by additional_providers_ or other scoped_ptr
-  // provider fields.
-  MountPointProviderMap provider_map_;
+  // This map itself doesn't retain each backend's ownership; ownerships
+  // of the backends are held by additional_backends_ or other scoped_ptr
+  // backend fields.
+  FileSystemBackendMap backend_map_;
 
   // External mount points visible in the file system context (excluding system
   // external mount points).