Split Media-related code from IsolatedMountPointProvider

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/single_thread_task_runner.h"
 #include "base/stl_util.h"
-#include "base/single_thread_task_runner.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/blob/file_stream_reader.h"
 #include "webkit/fileapi/copy_or_move_file_validator.h"
 #include "webkit/fileapi/external_mount_points.h"
 #include "webkit/fileapi/file_stream_writer.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/media/media_file_system_mount_point_provider.h"
 #include "webkit/fileapi/mount_points.h"
 #include "webkit/fileapi/sandbox_mount_point_provider.h"
 #include "webkit/fileapi/syncable/local_file_change_tracker.h"
 #include "webkit/fileapi/syncable/local_file_sync_context.h"
 #include "webkit/fileapi/syncable/syncable_file_system_util.h"
 #include "webkit/fileapi/test_mount_point_provider.h"
 #include "webkit/quota/quota_manager.h"
 #include "webkit/quota/special_storage_policy.h"
 
 #if defined(OS_CHROMEOS)
@@ skipping 31 matching lines @@
     const base::FilePath& partition_path,
     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)),
+      isolated_provider_(new IsolatedMountPointProvider()),
+      media_provider_(new MediaFileSystemMountPointProvider(partition_path)),
       additional_providers_(additional_providers.Pass()),
       external_mount_points_(external_mount_points),
       partition_path_(partition_path) {
   DCHECK(task_runners_.get());
 
   if (quota_manager_proxy) {
     quota_manager_proxy->RegisterClient(CreateQuotaClient(
             this, options.is_incognito()));
   }
 
   RegisterMountPointProvider(sandbox_provider_.get());
   RegisterMountPointProvider(isolated_provider_.get());
+  RegisterMountPointProvider(media_provider_.get());

[Greg Billock, 2013/04/18 16:18:02]

So the goal is to eventually have these registered from outside?

[kinuko, 2013/04/19 15:19:32]

Yes, that's the plan.  Now the ctor of this class (FileSystemContext) takes
'additional_providers' parameters so we can pass providers from outside
webkit/fileapi.

The last patch to unlock us to pass chrome-specific providers to this ctor is:
https://codereview.chromium.org/14317004/

 
 #if defined(OS_CHROMEOS)
   // TODO(kinuko): Move this out of webkit/fileapi layer.
   DCHECK(external_mount_points);
   external_provider_.reset(
       new chromeos::CrosMountPointProvider(
           special_storage_policy,
           external_mount_points,
           ExternalMountPoints::GetSystemInstance()));
   RegisterMountPointProvider(external_provider_.get());
@@ skipping 313 matching lines @@
     FileSystemType type = static_cast<FileSystemType>(t);
     if (provider->CanHandleType(type)) {
       const bool inserted = provider_map_.insert(
           std::make_pair(type, provider)).second;
       DCHECK(inserted);
     }
   }
 }
 
 }  // namespace fileapi