Make MountPointProvider pluggable from outside webkit/fileapi

webkit/tools/test_shell/simple_file_system.cc

Index: webkit/tools/test_shell/simple_file_system.cc
diff --git a/webkit/tools/test_shell/simple_file_system.cc b/webkit/tools/test_shell/simple_file_system.cc
index b2b509d4978d1b3bede9b65d283adf37af2a47d8..7752441e8f567cce8a7e30bf0bc9dbeda94cbb04 100644
--- a/webkit/tools/test_shell/simple_file_system.cc
+++ b/webkit/tools/test_shell/simple_file_system.cc
@@ -22,13 +22,11 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
 #include "webkit/base/file_path_string_conversions.h"
 #include "webkit/blob/blob_storage_controller.h"
-#include "webkit/fileapi/external_mount_points.h"
 #include "webkit/fileapi/file_permission_policy.h"
 #include "webkit/fileapi/file_system_mount_point_provider.h"
-#include "webkit/fileapi/file_system_task_runners.h"
 #include "webkit/fileapi/file_system_url.h"
 #include "webkit/fileapi/file_system_util.h"
-#include "webkit/fileapi/mock_file_system_options.h"
+#include "webkit/fileapi/mock_file_system_context.h"
 #include "webkit/tools/test_shell/simple_file_writer.h"
 
 using base::WeakPtr;
@@ -78,13 +76,9 @@ void RegisterBlob(const GURL& blob_url, const base::FilePath& file_path) {
 
 SimpleFileSystem::SimpleFileSystem() {
   if (file_system_dir_.CreateUniqueTempDir()) {
-    file_system_context_ = new FileSystemContext(
-        FileSystemTaskRunners::CreateMockTaskRunners(),
-        fileapi::ExternalMountPoints::CreateRefCounted().get(),
-        NULL /* special storage policy */,
+    file_system_context_ = fileapi::CreateFileSystemContextForTesting(
         NULL /* quota manager */,
-        file_system_dir_.path(),
-        fileapi::CreateAllowFileAccessOptions());
+        file_system_dir_.path());
   } else {
     LOG(WARNING) << "Failed to create a temp dir for the filesystem."
                     "FileSystem feature will be disabled.";