Make MountPointProvider pluggable from outside webkit/fileapi

webkit/fileapi/file_system_mount_point_provider_unittest.cc

Index: webkit/fileapi/file_system_mount_point_provider_unittest.cc
diff --git a/webkit/fileapi/file_system_mount_point_provider_unittest.cc b/webkit/fileapi/file_system_mount_point_provider_unittest.cc
index 6e4a8e8f62a7f96424dfef10d5026bf882e1bdef..8ded6374b2453ce1ad63d68488cc66d8c52ccb3c 100644
--- a/webkit/fileapi/file_system_mount_point_provider_unittest.cc
+++ b/webkit/fileapi/file_system_mount_point_provider_unittest.cc
@@ -116,18 +116,19 @@ class FileSystemMountPointProviderTest : public testing::Test {
 
   virtual void SetUp() {
     ASSERT_TRUE(data_dir_.CreateUniqueTempDir());
-    special_storage_policy_ = new quota::MockSpecialStoragePolicy;
   }
 
  protected:
   void SetupNewContext(const FileSystemOptions& options) {
     scoped_refptr<ExternalMountPoints> external_mount_points(
         ExternalMountPoints::CreateRefCounted());
+    std::vector<MountPoints*> additional_mount_points;
+    additional_mount_points.push_back(external_mount_points);
     file_system_context_ = new FileSystemContext(
         FileSystemTaskRunners::CreateMockTaskRunners(),
-        external_mount_points.get(),
-        special_storage_policy_,
         NULL,
+        ScopedVector<FileSystemMountPointProvider>(),
+        additional_mount_points,
         data_dir_.path(),
         options);
 #if defined(OS_CHROMEOS)
@@ -174,7 +175,6 @@ class FileSystemMountPointProviderTest : public testing::Test {
   MessageLoop message_loop_;
   base::WeakPtrFactory<FileSystemMountPointProviderTest> weak_factory_;
 
-  scoped_refptr<quota::SpecialStoragePolicy> special_storage_policy_;
   scoped_refptr<FileSystemContext> file_system_context_;
 
   DISALLOW_COPY_AND_ASSIGN(FileSystemMountPointProviderTest);