Make MountPointProvider pluggable from outside webkit/fileapi

webkit/fileapi/file_system_mount_point_provider_unittest.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 <set>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/file_util.h"
@@ skipping 98 matching lines @@
 }  // namespace
 
 class FileSystemMountPointProviderTest : public testing::Test {
  public:
   FileSystemMountPointProviderTest()
       : ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
   }
 
   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)
     base::FilePath mount_point_path = base::FilePath(kMountPoint);
     external_mount_points->RegisterFileSystem(
         mount_point_path.BaseName().AsUTF8Unsafe(),
         kFileSystemTypeNativeLocal,
         mount_point_path);
 #endif
   }
@@ skipping 26 matching lines @@
   }
   FileSystemContext* file_system_context() const {
     return file_system_context_.get();
   }
 
  private:
   base::ScopedTempDir data_dir_;
   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);
 };
 
 TEST_F(FileSystemMountPointProviderTest, GetRootPathCreateAndExamine) {
   std::vector<base::FilePath> returned_root_path(
       ARRAYSIZE_UNSAFE(kRootPathTestCases));
   SetupNewContext(CreateAllowFileAccessOptions());
 
@@ skipping 109 matching lines @@
                             kRootPathFileURITestCases[i].type,
                             true /* create */, &root_path));
     base::FilePath expected = file_system_path().AppendASCII(
         kRootPathFileURITestCases[i].expected_path);
     EXPECT_EQ(expected.value(), root_path.value());
     EXPECT_TRUE(file_util::DirectoryExists(root_path));
   }
 }
 
 }  // namespace fileapi