SyncFS: Introduce SyncFileSystemBackend

webkit/browser/fileapi/syncable/canned_syncable_file_system.cc

Index: webkit/browser/fileapi/syncable/canned_syncable_file_system.cc
diff --git a/webkit/browser/fileapi/syncable/canned_syncable_file_system.cc b/webkit/browser/fileapi/syncable/canned_syncable_file_system.cc
index 8bad8f374aee28333fde9bfdc0c1e206550feb46..84ab48a05048f1b4ad979c3bdf82a3308c6f0187 100644
--- a/webkit/browser/fileapi/syncable/canned_syncable_file_system.cc
+++ b/webkit/browser/fileapi/syncable/canned_syncable_file_system.cc
@@ -232,6 +232,14 @@ void CannedSyncableFileSystem::SetUp() {
       fileapi::FileSystemOptions::PROFILE_MODE_NORMAL,
       additional_allowed_schemes);
 
+  ScopedVector<fileapi::FileSystemMountPointProvider> additional_providers;
+  additional_providers.push_back(new SyncableSandboxMountPointProvider(
+      quota_manager_->proxy(),
+      file_task_runner_.get(),
+      data_dir_.path(),
+      options,
+      storage_policy));
+
   file_system_context_ = new FileSystemContext(
       make_scoped_ptr(
           new fileapi::FileSystemTaskRunners(io_task_runner_.get(),
@@ -239,7 +247,7 @@ void CannedSyncableFileSystem::SetUp() {
       fileapi::ExternalMountPoints::CreateRefCounted().get(),
       storage_policy.get(),
       quota_manager_->proxy(),
-      ScopedVector<fileapi::FileSystemMountPointProvider>(),
+      additional_providers.Pass(),
       data_dir_.path(), options);
 
   is_filesystem_set_up_ = true;
@@ -271,7 +279,7 @@ PlatformFileError CannedSyncableFileSystem::OpenFileSystem() {
       base::Bind(&CannedSyncableFileSystem::DidOpenFileSystem,
                  base::Unretained(this)));
   base::MessageLoop::current()->Run();
-  if (file_system_context_->sync_context()) {
+  if (mount_provider()->sync_context()) {
     // Register 'this' as a sync status observer.
     RunOnThread(
         io_task_runner_.get(),
@@ -493,7 +501,7 @@ void CannedSyncableFileSystem::GetChangedURLsInTracker(
       file_task_runner_.get(),
       FROM_HERE,
       base::Bind(&LocalFileChangeTracker::GetAllChangedURLs,
-                 base::Unretained(file_system_context_->change_tracker()),
+                 base::Unretained(mount_provider()->change_tracker()),
                  urls));
 }
 
@@ -503,10 +511,14 @@ void CannedSyncableFileSystem::ClearChangeForURLInTracker(
       file_task_runner_.get(),
       FROM_HERE,
       base::Bind(&LocalFileChangeTracker::ClearChangesForURL,
-                 base::Unretained(file_system_context_->change_tracker()),
+                 base::Unretained(mount_provider()->change_tracker()),
                  url));
 }
 
+SyncableSandboxMountPointProvider* CannedSyncableFileSystem::mount_provider() {
+  return SyncableSandboxMountPointProvider::GetProvider(file_system_context_);
+}
+
 FileSystemOperationRunner* CannedSyncableFileSystem::operation_runner() {
   return file_system_context_->operation_runner();
 }
@@ -666,7 +678,7 @@ void CannedSyncableFileSystem::DidInitializeFileSystemContext(
 
 void CannedSyncableFileSystem::InitializeSyncStatusObserver() {
   ASSERT_TRUE(io_task_runner_->RunsTasksOnCurrentThread());
-  file_system_context_->sync_context()->sync_status()->AddObserver(this);
+  mount_provider()->sync_context()->sync_status()->AddObserver(this);
 }
 
 }  // namespace sync_file_system