Support cross-profile copy between Chrome OS Google Drive folders.

Previously the processing of Drive entries are delegated to the
running profile of the apps, but now it is passed to the owning
profiles of each entries.

BUG=339706

Review URL: https://codereview.chromium.org/145973016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@248921 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/chrome_content_browser_client.cc

@@ -2555,7 +2555,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSystemBackends(
   DCHECK(external_mount_points);
   chromeos::FileSystemBackend* backend =
       new chromeos::FileSystemBackend(
-          new drive::FileSystemBackendDelegate(browser_context),
+          new drive::FileSystemBackendDelegate,
           browser_context->GetSpecialStoragePolicy(),
           external_mount_points,
           fileapi::ExternalMountPoints::GetSystemInstance());

chrome/browser/chromeos/drive/fileapi/async_file_util.cc

@@ -9,6 +9,7 @@
 #include "base/logging.h"
 #include "base/platform_file.h"
 #include "base/threading/sequenced_worker_pool.h"
+#include "chrome/browser/chromeos/drive/drive_integration_service.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/chromeos/drive/fileapi/fileapi_worker.h"
 #include "content/public/browser/browser_thread.h"
@@ -46,7 +47,7 @@ void PostFileSystemCallback(
 
 // Runs CreateOrOpenFile callback based on the given |error| and |file|.
 void RunCreateOrOpenFileCallback(
-    const AsyncFileUtil::FileSystemGetter& file_system_getter,
+    const fileapi_internal::FileSystemGetter& file_system_getter,
     const base::FilePath& file_path,
     const AsyncFileUtil::CreateOrOpenCallback& callback,
     base::File::Error error,
@@ -114,8 +115,7 @@ void RunCreateSnapshotFileCallback(
 
 }  // namespace
 
-AsyncFileUtil::AsyncFileUtil(const FileSystemGetter& file_system_getter)
-    : file_system_getter_(file_system_getter) {
+AsyncFileUtil::AsyncFileUtil() {
 }
 
 AsyncFileUtil::~AsyncFileUtil() {
@@ -137,13 +137,15 @@ void AsyncFileUtil::CreateOrOpen(
     return;
   }
 
+  const fileapi_internal::FileSystemGetter getter =
+      base::Bind(&fileapi_internal::GetFileSystemFromUrl, url);
   PostFileSystemCallback(
-      file_system_getter_,
+      getter,
       base::Bind(&fileapi_internal::OpenFile,
                  file_path, file_flags,
                  google_apis::CreateRelayCallback(
                      base::Bind(&RunCreateOrOpenFileCallback,
-                                file_system_getter_, file_path, callback))),
+                                getter, file_path, callback))),
       base::Bind(&RunCreateOrOpenFileCallbackOnError,
                  callback, base::File::FILE_ERROR_FAILED));
 }
@@ -161,7 +163,7 @@ void AsyncFileUtil::EnsureFileExists(
   }
 
   PostFileSystemCallback(
-      file_system_getter_,
+      base::Bind(&fileapi_internal::GetFileSystemFromUrl, url),
       base::Bind(&fileapi_internal::CreateFile,
                  file_path, true /* is_exlusive */,
                  google_apis::CreateRelayCallback(
@@ -184,7 +186,7 @@ void AsyncFileUtil::CreateDirectory(
   }
 
   PostFileSystemCallback(
-      file_system_getter_,
+      base::Bind(&fileapi_internal::GetFileSystemFromUrl, url),
       base::Bind(&fileapi_internal::CreateDirectory,
                  file_path, exclusive, recursive,
                  google_apis::CreateRelayCallback(callback)),
@@ -204,7 +206,7 @@ void AsyncFileUtil::GetFileInfo(
   }
 
   PostFileSystemCallback(
-      file_system_getter_,
+      base::Bind(&fileapi_internal::GetFileSystemFromUrl, url),
       base::Bind(&fileapi_internal::GetFileInfo,
                  file_path, google_apis::CreateRelayCallback(callback)),
       base::Bind(callback, base::File::FILE_ERROR_FAILED,
@@ -224,7 +226,7 @@ void AsyncFileUtil::ReadDirectory(
   }
 
   PostFileSystemCallback(
-      file_system_getter_,
+      base::Bind(&fileapi_internal::GetFileSystemFromUrl, url),
       base::Bind(&fileapi_internal::ReadDirectory,
                  file_path, google_apis::CreateRelayCallback(callback)),
       base::Bind(callback, base::File::FILE_ERROR_FAILED,
@@ -246,7 +248,7 @@ void AsyncFileUtil::Touch(
   }
 
   PostFileSystemCallback(
-      file_system_getter_,
+      base::Bind(&fileapi_internal::GetFileSystemFromUrl, url),
       base::Bind(&fileapi_internal::TouchFile,
                  file_path, last_access_time, last_modified_time,
                  google_apis::CreateRelayCallback(callback)),
@@ -267,7 +269,7 @@ void AsyncFileUtil::Truncate(
   }
 
   PostFileSystemCallback(
-      file_system_getter_,
+      base::Bind(&fileapi_internal::GetFileSystemFromUrl, url),
       base::Bind(&fileapi_internal::Truncate,
                  file_path, length, google_apis::CreateRelayCallback(callback)),
       base::Bind(callback, base::File::FILE_ERROR_FAILED));
@@ -289,8 +291,14 @@ void AsyncFileUtil::CopyFileLocal(
     return;
   }
 
+  // TODO(kinaba): crbug.com/339794.
+  // Assumption here is that |src_url| and |dest_url| are always from the same
+  // profile. This indeed holds as long as we mount different profiles onto
+  // different mount point. Hence, using GetFileSystemFromUrl(dest_url) is safe.
+  // This will change after we introduce cross-profile sharing etc., and we
+  // need to deal with files from different profiles here.
   PostFileSystemCallback(
-      file_system_getter_,
+      base::Bind(&fileapi_internal::GetFileSystemFromUrl, dest_url),
       base::Bind(
           &fileapi_internal::Copy,
           src_path, dest_path,
@@ -314,8 +322,11 @@ void AsyncFileUtil::MoveFileLocal(
     return;
   }
 
+  // TODO(kinaba): see the comment in CopyFileLocal(). |src_url| and |dest_url|
+  // always return the same FileSystem by GetFileSystemFromUrl, but we need to
+  // change it in order to support cross-profile file sharing etc.
   PostFileSystemCallback(
-      file_system_getter_,
+      base::Bind(&fileapi_internal::GetFileSystemFromUrl, dest_url),
       base::Bind(
           &fileapi_internal::Move,
           src_path, dest_path,
@@ -338,7 +349,7 @@ void AsyncFileUtil::CopyInForeignFile(
   }
 
   PostFileSystemCallback(
-      file_system_getter_,
+      base::Bind(&fileapi_internal::GetFileSystemFromUrl, dest_url),
       base::Bind(&fileapi_internal::CopyInForeignFile,
                  src_file_path, dest_path,
                  google_apis::CreateRelayCallback(callback)),
@@ -358,7 +369,7 @@ void AsyncFileUtil::DeleteFile(
   }
 
   PostFileSystemCallback(
-      file_system_getter_,
+      base::Bind(&fileapi_internal::GetFileSystemFromUrl, url),
       base::Bind(&fileapi_internal::Remove,
                  file_path, false /* not recursive */,
                  google_apis::CreateRelayCallback(callback)),
@@ -378,7 +389,7 @@ void AsyncFileUtil::DeleteDirectory(
   }
 
   PostFileSystemCallback(
-      file_system_getter_,
+      base::Bind(&fileapi_internal::GetFileSystemFromUrl, url),
       base::Bind(&fileapi_internal::Remove,
                  file_path, false /* not recursive */,
                  google_apis::CreateRelayCallback(callback)),
@@ -398,7 +409,7 @@ void AsyncFileUtil::DeleteRecursively(
   }
 
   PostFileSystemCallback(
-      file_system_getter_,
+      base::Bind(&fileapi_internal::GetFileSystemFromUrl, url),
       base::Bind(&fileapi_internal::Remove,
                  file_path, true /* recursive */,
                  google_apis::CreateRelayCallback(callback)),
@@ -421,7 +432,7 @@ void AsyncFileUtil::CreateSnapshotFile(
   }
 
   PostFileSystemCallback(
-      file_system_getter_,
+      base::Bind(&fileapi_internal::GetFileSystemFromUrl, url),
       base::Bind(&fileapi_internal::CreateSnapshotFile,
                  file_path,
                  google_apis::CreateRelayCallback(

chrome/browser/chromeos/drive/fileapi/async_file_util.h

@@ -18,13 +18,7 @@ namespace internal {
 // The implementation of fileapi::AsyncFileUtil for Drive File System.
 class AsyncFileUtil : public fileapi::AsyncFileUtil {
  public:
-  // Callback to return the FileSystemInterface instance. This is an
-  // injecting point for testing.
-  // Note that the callback will be copied between threads (IO and UI), and
-  // will be called on UI thread.
-  typedef base::Callback<FileSystemInterface*()> FileSystemGetter;
-
-  explicit AsyncFileUtil(const FileSystemGetter& file_system_getter);
+  AsyncFileUtil();
   virtual ~AsyncFileUtil();
 
   // fileapi::AsyncFileUtil overrides.
@@ -98,8 +92,6 @@ class AsyncFileUtil : public fileapi::AsyncFileUtil {
       const CreateSnapshotFileCallback& callback) OVERRIDE;
 
  private:
-  FileSystemGetter file_system_getter_;
-
   DISALLOW_COPY_AND_ASSIGN(AsyncFileUtil);
 };
 

chrome/browser/chromeos/drive/fileapi/file_system_backend_delegate.cc

@@ -9,10 +9,9 @@
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/chromeos/drive/fileapi/async_file_util.h"
+#include "chrome/browser/chromeos/drive/fileapi/fileapi_worker.h"
 #include "chrome/browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl.h"
 #include "chrome/browser/chromeos/drive/fileapi/webkit_file_stream_writer_impl.h"
-#include "chrome/browser/profiles/profile.h"
-#include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "webkit/browser/blob/file_stream_reader.h"
 #include "webkit/browser/fileapi/async_file_util.h"
@@ -23,12 +22,8 @@ using content::BrowserThread;
 
 namespace drive {
 
-FileSystemBackendDelegate::FileSystemBackendDelegate(
-    content::BrowserContext* browser_context)
-    : profile_id_(Profile::FromBrowserContext(browser_context)),
-      async_file_util_(new internal::AsyncFileUtil(
-          base::Bind(&util::GetFileSystemByProfileId, profile_id_))) {
-  DCHECK(profile_id_);
+FileSystemBackendDelegate::FileSystemBackendDelegate()
+    : async_file_util_(new internal::AsyncFileUtil) {
 }
 
 FileSystemBackendDelegate::~FileSystemBackendDelegate() {
@@ -56,7 +51,7 @@ FileSystemBackendDelegate::CreateFileStreamReader(
 
   return scoped_ptr<webkit_blob::FileStreamReader>(
       new internal::WebkitFileStreamReaderImpl(
-          base::Bind(&util::GetFileSystemByProfileId, profile_id_),
+          base::Bind(&fileapi_internal::GetFileSystemFromUrl, url),
           context->default_file_task_runner(),
           file_path, offset, expected_modification_time));
 }
@@ -76,7 +71,7 @@ FileSystemBackendDelegate::CreateFileStreamWriter(
 
   return scoped_ptr<fileapi::FileStreamWriter>(
       new internal::WebkitFileStreamWriterImpl(
-          base::Bind(&util::GetFileSystemByProfileId, profile_id_),
+          base::Bind(&fileapi_internal::GetFileSystemFromUrl, url),
           context->default_file_task_runner(),file_path, offset));
 }
 

chrome/browser/chromeos/drive/fileapi/file_system_backend_delegate.h

@@ -9,10 +9,6 @@
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/chromeos/fileapi/file_system_backend_delegate.h"
 
-namespace content {
-class BrowserContext;
-}  // namespace content
-
 namespace fileapi {
 class AsyncFileUtil;
 }  // namespace fileapi
@@ -23,8 +19,7 @@ namespace drive {
 // for Drive file system.
 class FileSystemBackendDelegate : public chromeos::FileSystemBackendDelegate {
  public:
-  // |browser_context| is used to obtain |profile_id_|.
-  explicit FileSystemBackendDelegate(content::BrowserContext* browser_context);
+  FileSystemBackendDelegate();
   virtual ~FileSystemBackendDelegate();
 
   // FileSystemBackend::Delegate overrides.
@@ -41,8 +36,6 @@ class FileSystemBackendDelegate : public chromeos::FileSystemBackendDelegate {
       fileapi::FileSystemContext* context) OVERRIDE;
 
  private:
-  // The profile for processing Drive accesses. Should not be NULL.
-  void* profile_id_;
   scoped_ptr<fileapi::AsyncFileUtil> async_file_util_;
 
   DISALLOW_COPY_AND_ASSIGN(FileSystemBackendDelegate);

chrome/browser/chromeos/drive/fileapi/fileapi_worker.cc

@@ -14,6 +14,7 @@
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/chromeos/drive/resource_entry_conversion.h"
 #include "content/public/browser/browser_thread.h"
+#include "webkit/browser/fileapi/file_system_url.h"
 #include "webkit/common/fileapi/directory_entry.h"
 
 using content::BrowserThread;
@@ -197,6 +198,13 @@ void OpenFileAfterFileSystemOpenFile(int file_flags,
 
 }  // namespace
 
+FileSystemInterface* GetFileSystemFromUrl(const fileapi::FileSystemURL& url) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+
+  Profile* profile = util::ExtractProfileFromPath(url.path());
+  return profile ? util::GetFileSystemByProfile(profile) : NULL;
+}
+
 void RunFileSystemCallback(
     const FileSystemGetter& file_system_getter,
     const base::Callback<void(FileSystemInterface*)>& callback,

chrome/browser/chromeos/drive/fileapi/fileapi_worker.h

@@ -34,6 +34,7 @@ class FilePath;
 
 namespace fileapi {
 struct DirectoryEntry;
+class FileSystemURL;
 }  // namespace fileapi
 
 namespace drive {
@@ -69,6 +70,11 @@ typedef base::Callback<
          base::PlatformFile platform_file,
          const base::Closure& close_callback)> OpenFileCallback;
 
+// Gets the profile of the Drive entry pointed by |url|. Used as
+// FileSystemGetter callback by binding an URL on the IO thread and passing to
+// the UI thread.
+FileSystemInterface* GetFileSystemFromUrl(const fileapi::FileSystemURL& url);
+
 // Runs |file_system_getter| to obtain the instance of FileSystemInstance,
 // and then runs |callback| with it.
 // If |file_system_getter| returns NULL, runs |error_callback| instead.