Make MountPointProvider pluggable from outside webkit/fileapi

webkit/fileapi/file_system_context_unittest.cc

 // Copyright (c) 2013 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 "webkit/fileapi/file_system_context.h"
 
 #include "base/files/scoped_temp_dir.h"
 #include "base/message_loop.h"
 #include "base/stringprintf.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/fileapi/external_mount_points.h"
+#include "webkit/fileapi/file_system_mount_point_provider.h"
 #include "webkit/fileapi/file_system_task_runners.h"
 #include "webkit/fileapi/isolated_context.h"
 #include "webkit/fileapi/mock_file_system_options.h"
 #include "webkit/quota/mock_quota_manager.h"
 #include "webkit/quota/mock_special_storage_policy.h"
 
 #define FPL(x) FILE_PATH_LITERAL(x)
 
 #if defined(FILE_PATH_USES_DRIVE_LETTERS)
 #define DRIVE FPL("C:")
@@ skipping 33 matching lines @@
         base::MessageLoopProxy::current(),
         storage_policy_);
   }
 
  protected:
   FileSystemContext* CreateFileSystemContextForTest(
       ExternalMountPoints* external_mount_points) {
     return new FileSystemContext(
         FileSystemTaskRunners::CreateMockTaskRunners(),
         external_mount_points,
-        storage_policy_,
+        make_scoped_refptr(new quota::MockSpecialStoragePolicy()),

[kinuko, 2013/04/17 14:27:29]

Will revert this change back to storage_policy_

         mock_quota_manager_->proxy(),
+        ScopedVector<FileSystemMountPointProvider>(),
         data_dir_.path(),
         CreateAllowFileAccessOptions());
   }
 
   // Verifies a *valid* filesystem url has expected values.
   void ExpectFileSystemURLMatches(const FileSystemURL& url,
                                   const GURL& expect_origin,
                                   FileSystemType expect_mount_type,
                                   FileSystemType expect_type,
                                   const base::FilePath& expect_path,
@@ skipping 50 matching lines @@
       isolated_id);
 
   FileSystemURL cracked_external = file_system_context->CrackURL(
       CreateRawFileSystemURL("external", "system"));
 
   ExpectFileSystemURLMatches(
       cracked_external,
       GURL(kTestOrigin),
       kFileSystemTypeExternal,
       kFileSystemTypeNativeLocal,
-      base::FilePath(DRIVE FPL("/test/sys/root/file")).NormalizePathSeparators(),
+      base::FilePath(
+          DRIVE FPL("/test/sys/root/file")).NormalizePathSeparators(),
       base::FilePath(FPL("system/root/file")).NormalizePathSeparators(),
       "system");
 
 
   IsolatedContext::GetInstance()->RevokeFileSystem(isolated_id);
   ExternalMountPoints::GetSystemInstance()->RevokeFileSystem("system");
 }
 #endif  // !defiend(OS_CHROMEOS)
 
 TEST_F(FileSystemContextTest, FileSystemContextKeepsMountPointsAlive) {
@@ skipping 15 matching lines @@
   // FileSystemContext should keep a reference to the |mount_points|, so it
   // should be able to resolve the URL.
   FileSystemURL cracked_external = file_system_context->CrackURL(
       CreateRawFileSystemURL("external", "system"));
 
   ExpectFileSystemURLMatches(
       cracked_external,
       GURL(kTestOrigin),
       kFileSystemTypeExternal,
       kFileSystemTypeNativeLocal,
-      base::FilePath(DRIVE FPL("/test/sys/root/file")).NormalizePathSeparators(),
+      base::FilePath(
+          DRIVE FPL("/test/sys/root/file")).NormalizePathSeparators(),
       base::FilePath(FPL("system/root/file")).NormalizePathSeparators(),
       "system");
 
   // No need to revoke the registered filesystem since |mount_points| lifetime
   // is bound to this test.
 }
 
 TEST_F(FileSystemContextTest, CrackFileSystemURL) {
   scoped_refptr<ExternalMountPoints> external_mount_points(
       ExternalMountPoints::CreateRefCounted());
@@ skipping 132 matching lines @@
       base::FilePath(DRIVE FPL("/test/isolated/root")));
   ExternalMountPoints::GetSystemInstance()->RevokeFileSystem("system");
   ExternalMountPoints::GetSystemInstance()->RevokeFileSystem("ext");
   ExternalMountPoints::GetSystemInstance()->RevokeFileSystem(
       kIsolatedFileSystemID);
 }
 
 }  // namespace
 
 }  // namespace fileapi