Extract Drive related code to drive::MountPointProviderDelegate.

chrome/browser/chromeos/fileapi/cros_mount_point_provider.h

 // Copyright 2013 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 CHROME_BROWSER_CHROMEOS_FILEAPI_CROS_MOUNT_POINT_PROVIDER_H_
 #define CHROME_BROWSER_CHROMEOS_FILEAPI_CROS_MOUNT_POINT_PROVIDER_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 51 matching lines @@
 // system URLs for these mount points look like:
 //
 //   filesystem:<origin>/external/<mount_name>/...
 //
 class CrosMountPointProvider
     : public fileapi::ExternalFileSystemMountPointProvider {
  public:
   using fileapi::FileSystemMountPointProvider::OpenFileSystemCallback;
   using fileapi::FileSystemMountPointProvider::DeleteFileSystemCallback;
 
+  // This is delegate interface to inject Drive File System without explicit
+  // dependency in the header file.

[satorux1, 2013/07/03 05:44:29]

I'm confused

drive::MountPointProviderDelegate is created in the cros_mount_point_provider.cc
file, and the header file is included:

#include "chrome/browser/chromeos/drive/mount_point_provider_delegate.h"

Could you revise this comment and clarify why is this delegate interface is
needed?

[hidehiko, 2013/07/03 08:37:01]

Done.

+  class Delegate {

[satorux1, 2013/07/03 05:44:29]

Nested classes are usually avoided:

http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml?showone=Nested...

[hidehiko, 2013/07/03 08:37:01]

Done.

+   public:
+    virtual ~Delegate() {}
+
+    // Called from CrosMountPointProvider::GetAsyncFileUtil().
+    virtual fileapi::AsyncFileUtil* GetAsyncFileUtil(
+        fileapi::FileSystemType type) = 0;
+
+    // Called from CrosMountPointProvider::CreateFileStreamReader().
+    virtual scoped_ptr<webkit_blob::FileStreamReader> CreateFileStreamReader(
+        const fileapi::FileSystemURL& url,
+        int64 offset,
+        const base::Time& expected_modification_time,
+        fileapi::FileSystemContext* context) = 0;
+
+    // Called from CrosMountPointProvider::CreateFileStreamWriter().
+    virtual scoped_ptr<fileapi::FileStreamWriter> CreateFileStreamWriter(
+        const fileapi::FileSystemURL& url,
+        int64 offset,
+        fileapi::FileSystemContext* context) = 0;
+
+    // Called from CrosMountPointProvider::CreateFileSystemOperation().
+    // TODO(hidehiko): Get rid of this method when we merge the
+    // {Remote,Local}FileSystemOperation.
+    virtual fileapi::FileSystemOperation* CreateFileSystemOperation(
+        const fileapi::FileSystemURL& url,
+        fileapi::FileSystemContext* context,
+        base::PlatformFileError* error_code) = 0;
+  };
+
   // CrosMountPointProvider will take an ownership of a |mount_points|
   // reference. On the other hand, |system_mount_points| will be kept as a raw
   // pointer and it should outlive CrosMountPointProvider instance.
   CrosMountPointProvider(
       scoped_refptr<quota::SpecialStoragePolicy> special_storage_policy,
       scoped_refptr<fileapi::ExternalMountPoints> mount_points,
       fileapi::ExternalMountPoints* system_mount_points);
   virtual ~CrosMountPointProvider();
 
   // Adds system mount points, such as "archive", and "removable". This
@@ skipping 48 matching lines @@
       const std::string& extension_id) OVERRIDE;
   virtual void GrantFileAccessToExtension(
       const std::string& extension_id,
       const base::FilePath& virtual_path) OVERRIDE;
   virtual void RevokeAccessForExtension(
       const std::string& extension_id) OVERRIDE;
   virtual bool GetVirtualPath(const base::FilePath& filesystem_path,
                               base::FilePath* virtual_path) OVERRIDE;
 
  private:
-  fileapi::RemoteFileSystemProxyInterface* GetRemoteProxy(
-      const std::string& mount_name) const;
   base::FilePath GetFileSystemRootPath(const fileapi::FileSystemURL& url) const;
 
   scoped_refptr<quota::SpecialStoragePolicy> special_storage_policy_;
   scoped_ptr<FileAccessPermissions> file_access_permissions_;
   scoped_ptr<fileapi::AsyncFileUtilAdapter> local_file_util_;
 
+  // The Delegate instance for the drive file system related operation.
+  scoped_ptr<Delegate> drive_delegate_;
+
   // Mount points specific to the owning context (i.e. per-profile mount
   // points).
   //
   // It is legal to have mount points with the same name as in
   // system_mount_points_. Also, mount point paths may overlap with mount point
   // paths in system_mount_points_. In both cases mount points in
   // |mount_points_| will have a priority.
   // E.g. if |mount_points_| map 'foo1' to '/foo/foo1' and
   // |file_system_mount_points_| map 'xxx' to '/foo/foo1/xxx', |GetVirtualPaths|
   // will resolve '/foo/foo1/xxx/yyy' as 'foo1/xxx/yyy' (i.e. the mapping from
   // |mount_points_| will be used).
   scoped_refptr<fileapi::ExternalMountPoints> mount_points_;
 
   // Globally visible mount points. System MountPonts instance should outlive
   // all CrosMountPointProvider instances, so raw pointer is safe.
   fileapi::ExternalMountPoints* system_mount_points_;
 
   DISALLOW_COPY_AND_ASSIGN(CrosMountPointProvider);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_FILEAPI_CROS_MOUNT_POINT_PROVIDER_H_