Make MountPointProvider pluggable from outside webkit/fileapi

webkit/fileapi/media/native_media_file_util_unittest.cc

Index: webkit/fileapi/media/native_media_file_util_unittest.cc
diff --git a/webkit/fileapi/media/native_media_file_util_unittest.cc b/webkit/fileapi/media/native_media_file_util_unittest.cc
index 71afc1c3a9654ca092e681e13ae6591083a07d08..ee13dfad7b75b8c9e1b9983698ed4e51ef6b7d0a 100644
--- a/webkit/fileapi/media/native_media_file_util_unittest.cc
+++ b/webkit/fileapi/media/native_media_file_util_unittest.cc
@@ -14,6 +14,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/fileapi/external_mount_points.h"
 #include "webkit/fileapi/file_system_context.h"
+#include "webkit/fileapi/file_system_mount_point_provider.h"
 #include "webkit/fileapi/file_system_operation.h"
 #include "webkit/fileapi/file_system_task_runners.h"
 #include "webkit/fileapi/file_system_url.h"
@@ -21,7 +22,6 @@
 #include "webkit/fileapi/media/native_media_file_util.h"
 #include "webkit/fileapi/mock_file_system_options.h"
 #include "webkit/fileapi/native_file_util.h"
-#include "webkit/quota/mock_special_storage_policy.h"
 
 #define FPL(x) FILE_PATH_LITERAL(x)
 
@@ -108,15 +108,12 @@ class NativeMediaFileUtilTest : public testing::Test {
     ASSERT_TRUE(data_dir_.CreateUniqueTempDir());
     ASSERT_TRUE(file_util::CreateDirectory(root_path()));
 
-    scoped_refptr<quota::SpecialStoragePolicy> storage_policy =
-        new quota::MockSpecialStoragePolicy();
-
     file_system_context_ =
         new FileSystemContext(
             FileSystemTaskRunners::CreateMockTaskRunners(),
-            ExternalMountPoints::CreateRefCounted().get(),
-            storage_policy,
             NULL,
+            ScopedVector<FileSystemMountPointProvider>(),
+            std::vector<MountPoints*>(),
             data_dir_.path(),
             CreateAllowFileAccessOptions());