Extract external file systems handling from isolated context.

webkit/fileapi/file_system_context.cc

 // Copyright (c) 2012 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.
 
 #include "webkit/fileapi/file_system_context.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/stl_util.h"
 #include "base/single_thread_task_runner.h"
 #include "googleurl/src/gurl.h"
+#include "webkit/fileapi/external_mount_points.h"
 #include "webkit/fileapi/file_system_file_util.h"
 #include "webkit/fileapi/file_system_operation.h"
 #include "webkit/fileapi/file_system_options.h"
 #include "webkit/fileapi/file_system_quota_client.h"
 #include "webkit/fileapi/file_system_task_runners.h"
 #include "webkit/fileapi/file_system_url.h"
 #include "webkit/fileapi/file_system_util.h"
 #include "webkit/fileapi/isolated_context.h"
 #include "webkit/fileapi/isolated_mount_point_provider.h"
 #include "webkit/fileapi/sandbox_mount_point_provider.h"
@@ skipping 38 matching lines @@
     const FileSystemOptions& options)
     : task_runners_(task_runners.Pass()),
       quota_manager_proxy_(quota_manager_proxy),
       sandbox_provider_(
           new SandboxMountPointProvider(
               quota_manager_proxy,
               task_runners_->file_task_runner(),
               partition_path,
               options)),
       isolated_provider_(new IsolatedMountPointProvider(partition_path)),
-      partition_path_(partition_path) {
+      partition_path_(partition_path),
+      // TODO(tbarzic): Pass this from upper levels.
+      external_mount_points_(fileapi::ExternalMountPoints::CreateRefCounted()) {

[kinuko, 2013/01/08 12:22:43]

Can we drop this change from this CL? It doesn't seem to be used yet.

[tbarzic, 2013/01/09 01:26:34]

Done.

   DCHECK(task_runners_.get());
 
   if (quota_manager_proxy) {
     quota_manager_proxy->RegisterClient(CreateQuotaClient(
             this, options.is_incognito()));
   }
 #if defined(OS_CHROMEOS)
   external_provider_.reset(
-      new chromeos::CrosMountPointProvider(special_storage_policy));
+      new chromeos::CrosMountPointProvider(
+          special_storage_policy,
+          // TODO(tbarzic): Switch this to |external_mount_points_|.
+          fileapi::ExternalMountPoints::GetSystemInstance(),
+          fileapi::ExternalMountPoints::GetSystemInstance()));

[kinuko, 2013/01/08 12:22:43]

ditto.

[tbarzic, 2013/01/09 01:26:34]

I'd rather leave this (this cl does separate system and per-context external
mount points in cros_mount_point_provider, it just does not utilize it outside
the test code).

 #endif
 }
 
 bool FileSystemContext::DeleteDataForOriginOnFileThread(
     const GURL& origin_url) {
   DCHECK(task_runners_->file_task_runner()->RunsTasksOnCurrentThread());
   DCHECK(sandbox_provider());
   DCHECK(origin_url == origin_url.GetOrigin());
 
   // Delete temporary and persistent data.
@@ skipping 147 matching lines @@
   mount_point_provider->DeleteFileSystem(origin_url, type, this, callback);
 }
 
 FileSystemOperation* FileSystemContext::CreateFileSystemOperation(
     const FileSystemURL& url, PlatformFileError* error_code) {
   if (!url.is_valid()) {
     if (error_code)
       *error_code = base::PLATFORM_FILE_ERROR_INVALID_URL;
     return NULL;
   }
+
   FileSystemMountPointProvider* mount_point_provider =
       GetMountPointProvider(url.type());
   if (!mount_point_provider) {
     if (error_code)
       *error_code = base::PLATFORM_FILE_ERROR_FAILED;
     return NULL;
   }
 
   PlatformFileError fs_error = base::PLATFORM_FILE_OK;
   FileSystemOperation* operation =
@@ skipping 53 matching lines @@
   if (!task_runners_->io_task_runner()->RunsTasksOnCurrentThread() &&
       task_runners_->io_task_runner()->DeleteSoon(FROM_HERE, this)) {
     return;
   }
   STLDeleteContainerPairSecondPointers(provider_map_.begin(),
                                        provider_map_.end());
   delete this;
 }
 
 }  // namespace fileapi