Extract Drive related code to drive::MountPointProviderDelegate.

chrome/browser/chromeos/fileapi/cros_mount_point_provider.cc

Index: chrome/browser/chromeos/fileapi/cros_mount_point_provider.cc
diff --git a/chrome/browser/chromeos/fileapi/cros_mount_point_provider.cc b/chrome/browser/chromeos/fileapi/cros_mount_point_provider.cc
index 82da08320e5721fa0bfce493090ee54ef904b248..b5c693f197756809885d19374b6894041d0f0ded 100644
--- a/chrome/browser/chromeos/fileapi/cros_mount_point_provider.cc
+++ b/chrome/browser/chromeos/fileapi/cros_mount_point_provider.cc
@@ -11,10 +11,10 @@
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/synchronization/lock.h"
+#include "chrome/browser/chromeos/drive/mount_point_provider_delegate.h"
 #include "chrome/browser/chromeos/fileapi/file_access_permissions.h"
-#include "chrome/browser/chromeos/fileapi/remote_file_stream_writer.h"
-#include "chrome/browser/chromeos/fileapi/remote_file_system_operation.h"
 #include "chromeos/dbus/cros_disks_client.h"
+#include "webkit/browser/blob/file_stream_reader.h"
 #include "webkit/browser/fileapi/async_file_util_adapter.h"
 #include "webkit/browser/fileapi/copy_or_move_file_validator.h"
 #include "webkit/browser/fileapi/external_mount_points.h"
@@ -53,6 +53,7 @@ CrosMountPointProvider::CrosMountPointProvider(
       file_access_permissions_(new FileAccessPermissions()),
       local_file_util_(new fileapi::AsyncFileUtilAdapter(
           new fileapi::IsolatedFileUtil())),
+      drive_delegate_(new drive::MountPointProviderDelegate(mount_points)),
       mount_points_(mount_points),
       system_mount_points_(system_mount_points) {
 }
@@ -220,6 +221,9 @@ fileapi::FileSystemFileUtil* CrosMountPointProvider::GetFileUtil(
 
 fileapi::AsyncFileUtil* CrosMountPointProvider::GetAsyncFileUtil(
     fileapi::FileSystemType type) {
+  if (type == fileapi::kFileSystemTypeDrive)
+    return drive_delegate_->GetAsyncFileUtil(type);
+
   DCHECK(type == fileapi::kFileSystemTypeNativeLocal ||
          type == fileapi::kFileSystemTypeRestrictedNativeLocal);
   return local_file_util_.get();
@@ -244,15 +248,8 @@ fileapi::FileSystemOperation* CrosMountPointProvider::CreateFileSystemOperation(
     return NULL;
   }
 
-  if (url.type() == fileapi::kFileSystemTypeDrive) {
-    fileapi::RemoteFileSystemProxyInterface* remote_proxy =
-        GetRemoteProxy(url.filesystem_id());
-    if (!remote_proxy) {
-      *error_code = base::PLATFORM_FILE_ERROR_NOT_FOUND;
-      return NULL;
-    }
-    return new RemoteFileSystemOperation(remote_proxy);
-  }
+  if (url.type() == fileapi::kFileSystemTypeDrive)
+    return drive_delegate_->CreateFileSystemOperation(url, context, error_code);
 
   DCHECK(url.type() == fileapi::kFileSystemTypeNativeLocal ||
          url.type() == fileapi::kFileSystemTypeRestrictedNativeLocal);
@@ -275,13 +272,8 @@ CrosMountPointProvider::CreateFileStreamReader(
     return scoped_ptr<webkit_blob::FileStreamReader>();
 
   if (url.type() == fileapi::kFileSystemTypeDrive) {
-    fileapi::RemoteFileSystemProxyInterface* remote_proxy =
-        GetRemoteProxy(url.filesystem_id());
-    if (!remote_proxy)
-      return scoped_ptr<webkit_blob::FileStreamReader>();
-    return remote_proxy->CreateFileStreamReader(
-        context->task_runners()->file_task_runner(),
-        url, offset, expected_modification_time);
+    return drive_delegate_->CreateFileStreamReader(
+        url, offset, expected_modification_time, context);
   }
 
   return scoped_ptr<webkit_blob::FileStreamReader>(
@@ -299,16 +291,8 @@ CrosMountPointProvider::CreateFileStreamWriter(
   if (!IsAccessAllowed(url))
     return scoped_ptr<fileapi::FileStreamWriter>();
 
-  if (url.type() == fileapi::kFileSystemTypeDrive) {
-    fileapi::RemoteFileSystemProxyInterface* remote_proxy =
-        GetRemoteProxy(url.filesystem_id());
-    if (!remote_proxy)
-      return scoped_ptr<fileapi::FileStreamWriter>();
-    return scoped_ptr<fileapi::FileStreamWriter>(
-        new RemoteFileStreamWriter(
-            remote_proxy, url, offset,
-            context->task_runners()->file_task_runner()));
-  }
+  if (url.type() == fileapi::kFileSystemTypeDrive)
+    return drive_delegate_->CreateFileStreamWriter(url, offset, context);
 
   if (url.type() == fileapi::kFileSystemTypeRestrictedNativeLocal)
     return scoped_ptr<fileapi::FileStreamWriter>();
@@ -326,15 +310,6 @@ bool CrosMountPointProvider::GetVirtualPath(
          system_mount_points_->GetVirtualPath(filesystem_path, virtual_path);
 }
 
-fileapi::RemoteFileSystemProxyInterface* CrosMountPointProvider::GetRemoteProxy(
-    const std::string& mount_name) const {
-  fileapi::RemoteFileSystemProxyInterface* proxy =
-      mount_points_->GetRemoteFileSystemProxy(mount_name);
-  if (proxy)
-    return proxy;
-  return system_mount_points_->GetRemoteFileSystemProxy(mount_name);
-}
-
 base::FilePath CrosMountPointProvider::GetFileSystemRootPath(
     const fileapi::FileSystemURL& url) const {
   DCHECK(fileapi::IsolatedContext::IsIsolatedType(url.mount_type()));