4 files changed, 20 insertions, 21 deletions
diff --git a/chrome/browser/chromeos/drive/mount_point_provider_delegate.cc b/chrome/browser/chromeos/drive/file_system_backend_delegate.cc
index 9ded16e..f090aed 100644
--- a/chrome/browser/chromeos/drive/mount_point_provider_delegate.cc
+++ b/chrome/browser/chromeos/drive/file_system_backend_delegate.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/drive/mount_point_provider_delegate.h"
+#include "chrome/browser/chromeos/drive/file_system_backend_delegate.h"
 
 #include "chrome/browser/chromeos/drive/remote_file_stream_writer.h"
 #include "chrome/browser/chromeos/fileapi/remote_file_system_operation.h"
@@ -16,15 +16,15 @@ using content::BrowserThread;
 
 namespace drive {
 
-MountPointProviderDelegate::MountPointProviderDelegate(
+FileSystemBackendDelegate::FileSystemBackendDelegate(
     fileapi::ExternalMountPoints* mount_points)
     : mount_points_(mount_points) {
 }
 
-MountPointProviderDelegate::~MountPointProviderDelegate() {
+FileSystemBackendDelegate::~FileSystemBackendDelegate() {
 }
 
-fileapi::AsyncFileUtil* MountPointProviderDelegate::GetAsyncFileUtil(
+fileapi::AsyncFileUtil* FileSystemBackendDelegate::GetAsyncFileUtil(
     fileapi::FileSystemType type) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK_EQ(fileapi::kFileSystemTypeDrive, type);
@@ -35,7 +35,7 @@ fileapi::AsyncFileUtil* MountPointProviderDelegate::GetAsyncFileUtil(
 }
 
 scoped_ptr<webkit_blob::FileStreamReader>
-MountPointProviderDelegate::CreateFileStreamReader(
+FileSystemBackendDelegate::CreateFileStreamReader(
     const fileapi::FileSystemURL& url,
     int64 offset,
     const base::Time& expected_modification_time,
@@ -54,7 +54,7 @@ MountPointProviderDelegate::CreateFileStreamReader(
 }
 
 scoped_ptr<fileapi::FileStreamWriter>
-MountPointProviderDelegate::CreateFileStreamWriter(
+FileSystemBackendDelegate::CreateFileStreamWriter(
     const fileapi::FileSystemURL& url,
     int64 offset,
     fileapi::FileSystemContext* context) {
@@ -72,7 +72,7 @@ MountPointProviderDelegate::CreateFileStreamWriter(
 }
 
 fileapi::FileSystemOperation*
-MountPointProviderDelegate::CreateFileSystemOperation(
+FileSystemBackendDelegate::CreateFileSystemOperation(
     const fileapi::FileSystemURL& url,
     fileapi::FileSystemContext* context,
     base::PlatformFileError* error_code) {
diff --git a/chrome/browser/chromeos/drive/mount_point_provider_delegate.h b/chrome/browser/chromeos/drive/file_system_backend_delegate.h
index b5a4734..4cb916e 100644
--- a/chrome/browser/chromeos/drive/mount_point_provider_delegate.h
+++ b/chrome/browser/chromeos/drive/file_system_backend_delegate.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_MOUNT_POINT_PROVIDER_DELEGATE_H_
-#define CHROME_BROWSER_CHROMEOS_DRIVE_MOUNT_POINT_PROVIDER_DELEGATE_H_
+#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_BACKEND_DELEGATE_H_
+#define CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_BACKEND_DELEGATE_H_
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
-#include "chrome/browser/chromeos/fileapi/cros_mount_point_provider_delegate.h"
+#include "chrome/browser/chromeos/fileapi/file_system_backend_delegate.h"
 
 namespace fileapi {
 class ExternalMountPoints;
@@ -15,16 +15,15 @@ class ExternalMountPoints;
 
 namespace drive {
 
-// Delegate implementation of the some methods in CrosMountPointProvider
+// Delegate implementation of the some methods in chromeos::FileSystemBackend
 // for Drive file system.
-class MountPointProviderDelegate
-    : public chromeos::CrosMountPointProviderDelegate {
+class FileSystemBackendDelegate : public chromeos::FileSystemBackendDelegate {
  public:
-  explicit MountPointProviderDelegate(
+  explicit FileSystemBackendDelegate(
       fileapi::ExternalMountPoints* mount_points);
-  virtual ~MountPointProviderDelegate();
+  virtual ~FileSystemBackendDelegate();
 
-  // CrosMountPointProvider::Delegate overrides.
+  // FileSystemBackend::Delegate overrides.
   virtual fileapi::AsyncFileUtil* GetAsyncFileUtil(
       fileapi::FileSystemType type) OVERRIDE;
   virtual scoped_ptr<webkit_blob::FileStreamReader> CreateFileStreamReader(
@@ -44,9 +43,9 @@ class MountPointProviderDelegate
  private:
   scoped_refptr<fileapi::ExternalMountPoints> mount_points_;
 
-  DISALLOW_COPY_AND_ASSIGN(MountPointProviderDelegate);
+  DISALLOW_COPY_AND_ASSIGN(FileSystemBackendDelegate);
 };
 
 }  // namespace drive
 
-#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_MOUNT_POINT_PROVIDER_DELEGATE_H_
+#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_BACKEND_DELEGATE_H_
diff --git a/chrome/browser/chromeos/drive/file_system_proxy.cc b/chrome/browser/chromeos/drive/file_system_proxy.cc
index 1377ff7..2271049 100644
--- a/chrome/browser/chromeos/drive/file_system_proxy.cc
+++ b/chrome/browser/chromeos/drive/file_system_proxy.cc
@@ -383,7 +383,7 @@ FileSystemProxy::CreateFileStreamReader(
 }
 
 FileSystemProxy::~FileSystemProxy() {
-  // Should be deleted from the CrosMountPointProvider on UI thread.
+  // Should be deleted from the FileSystemBackend on UI thread.
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 }
 
diff --git a/chrome/browser/chromeos/drive/file_system_util_unittest.cc b/chrome/browser/chromeos/drive/file_system_util_unittest.cc
index db0f346..513eaa6 100644
--- a/chrome/browser/chromeos/drive/file_system_util_unittest.cc
+++ b/chrome/browser/chromeos/drive/file_system_util_unittest.cc
@@ -14,8 +14,8 @@
 #include "chrome/test/base/testing_profile.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/browser/fileapi/external_mount_points.h"
+#include "webkit/browser/fileapi/file_system_backend.h"
 #include "webkit/browser/fileapi/file_system_context.h"
-#include "webkit/browser/fileapi/file_system_mount_point_provider.h"
 #include "webkit/browser/fileapi/file_system_task_runners.h"
 #include "webkit/browser/fileapi/file_system_url.h"
 #include "webkit/browser/fileapi/isolated_context.h"
@@ -103,7 +103,7 @@ TEST(FileSystemUtilTest, ExtractDrivePathFromFileSystemUrl) {
           mount_points.get(),
           NULL,  // special_storage_policy
           NULL,  // quota_manager_proxy,
-          ScopedVector<fileapi::FileSystemMountPointProvider>(),
+          ScopedVector<fileapi::FileSystemBackend>(),
           temp_dir_.path(),  // partition_path
           fileapi::CreateAllowFileAccessOptions()));