Extract external file systems handling from isolated context.

webkit/fileapi/file_system_context.cc

Index: webkit/fileapi/file_system_context.cc
diff --git a/webkit/fileapi/file_system_context.cc b/webkit/fileapi/file_system_context.cc
index 44142e762efb834f8988ecb0153fe8c548248bbe..d7f4894660fa24811b6891d294efb70caa5bc55f 100644
--- a/webkit/fileapi/file_system_context.cc
+++ b/webkit/fileapi/file_system_context.cc
@@ -9,6 +9,7 @@
 #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"
@@ -67,7 +68,9 @@ FileSystemContext::FileSystemContext(
               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) {
@@ -76,7 +79,11 @@ FileSystemContext::FileSystemContext(
   }
 #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
 }
 
@@ -244,6 +251,7 @@ FileSystemOperation* FileSystemContext::CreateFileSystemOperation(
       *error_code = base::PLATFORM_FILE_ERROR_INVALID_URL;
     return NULL;
   }
+
   FileSystemMountPointProvider* mount_point_provider =
       GetMountPointProvider(url.type());
   if (!mount_point_provider) {