Split Media-related code from IsolatedMountPointProvider

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 9d753b6a3729f9660f4474b85c445ecff61fd6bc..d91cc1645750bb26b33dbebb96f9e417f1634e38 100644
--- a/webkit/fileapi/file_system_context.cc
+++ b/webkit/fileapi/file_system_context.cc
@@ -5,8 +5,8 @@
 #include "webkit/fileapi/file_system_context.h"
 
 #include "base/bind.h"
-#include "base/stl_util.h"
 #include "base/single_thread_task_runner.h"
+#include "base/stl_util.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/blob/file_stream_reader.h"
 #include "webkit/fileapi/copy_or_move_file_validator.h"
@@ -21,6 +21,7 @@
 #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"
@@ -72,7 +73,8 @@ FileSystemContext::FileSystemContext(
               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) {
@@ -85,6 +87,7 @@ FileSystemContext::FileSystemContext(
 
   RegisterMountPointProvider(sandbox_provider_.get());
   RegisterMountPointProvider(isolated_provider_.get());
+  RegisterMountPointProvider(media_provider_.get());
 
 #if defined(OS_CHROMEOS)
   // TODO(kinuko): Move this out of webkit/fileapi layer.