Make MountPointProvider pluggable from outside webkit/fileapi

webkit/fileapi/local_file_system_test_helper.cc

Index: webkit/fileapi/local_file_system_test_helper.cc
diff --git a/webkit/fileapi/local_file_system_test_helper.cc b/webkit/fileapi/local_file_system_test_helper.cc
index 7d4692250703fe255655fec44b0c2da044b922be..2bcf5d01eed62e3a68a9fe81f70e7c4b81fc802f 100644
--- a/webkit/fileapi/local_file_system_test_helper.cc
+++ b/webkit/fileapi/local_file_system_test_helper.cc
@@ -63,14 +63,11 @@ void LocalFileSystemTestOriginHelper::SetUp(
     const base::FilePath& base_dir,
     bool unlimited_quota,
     quota::QuotaManagerProxy* quota_manager_proxy) {
-  scoped_refptr<quota::MockSpecialStoragePolicy> special_storage_policy =
-      new quota::MockSpecialStoragePolicy;
-  special_storage_policy->SetAllUnlimited(unlimited_quota);
   file_system_context_ = new FileSystemContext(
       FileSystemTaskRunners::CreateMockTaskRunners(),
-      ExternalMountPoints::CreateRefCounted().get(),
-      special_storage_policy,
       quota_manager_proxy,
+      ScopedVector<FileSystemMountPointProvider>(),
+      std::vector<MountPoints*>(),
       base_dir,
       CreateAllowFileAccessOptions());
 
@@ -173,7 +170,7 @@ FileSystemUsageCache* LocalFileSystemTestOriginHelper::usage_cache() {
 void LocalFileSystemTestOriginHelper::SetUpFileUtil() {
   DCHECK(file_system_context_);
   if (type_ == kFileSystemTypeTest) {
-    file_system_context_->RegisterMountPointProvider(
+    file_system_context_->RegisterMountPointProviderForTesting(
         type_,
         new TestMountPointProvider(
             file_system_context_->task_runners()->file_task_runner(),