SyncFS: Introduce SyncFileSystemBackend

webkit/browser/fileapi/file_system_context.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 "webkit/browser/fileapi/file_system_context.h"
 
 #include "base/bind.h"
 #include "base/single_thread_task_runner.h"
 #include "base/stl_util.h"
 #include "base/task_runner_util.h"
@@ skipping 117 matching lines @@
     quota_manager_proxy->RegisterClient(CreateQuotaClient(
             this, options.is_incognito()));
   }
 
   RegisterBackend(sandbox_backend_.get());
   RegisterBackend(isolated_backend_.get());
 
   for (ScopedVector<FileSystemBackend>::const_iterator iter =
           additional_backends_.begin();
        iter != additional_backends_.end(); ++iter) {
+    (*iter)->Initialize(this);
     RegisterBackend(*iter);

[kinuko, 2013/07/23 06:41:51]

I'd have another loop for Initialize after this loop, so that each backend
doesn't need to care about registration order in Initialize().

[nhiroki, 2013/07/24 05:58:47]

Done in a separate CL.

   }
 
   // Additional mount points must be added before regular system-wide
   // mount points.
   if (external_mount_points)
     url_crackers_.push_back(external_mount_points);
   url_crackers_.push_back(ExternalMountPoints::GetSystemInstance());
   url_crackers_.push_back(IsolatedContext::GetInstance());
 }
 
@@ skipping 64 matching lines @@
   NOTREACHED() << "Unknown filesystem type: " << type;
   return NULL;
 }
 
 bool FileSystemContext::IsSandboxFileSystem(FileSystemType type) const {
   return GetQuotaUtil(type) != NULL;
 }
 
 const UpdateObserverList* FileSystemContext::GetUpdateObservers(
     FileSystemType type) const {
-  // Currently update observer is only available in SandboxFileSystemBackend
-  // and TestFileSystemBackend.
-  // TODO(kinuko): Probably GetUpdateObservers() virtual method should be
-  // added to FileSystemBackend interface and be called like
-  // other GetFoo() methods do.
+  // Currently update observer is only available in SandboxFileSystemBackend,
+  // SyncFileSystemBackend and TestFileSystemBackend.
   if (sandbox_backend_->CanHandleType(type))
     return sandbox_backend_->GetUpdateObservers(type);
-  if (type != kFileSystemTypeTest)
-    return NULL;
   FileSystemBackend* backend = GetFileSystemBackend(type);
-  return static_cast<TestFileSystemBackend*>(
-      backend)->GetUpdateObservers(type);
+  if (type == kFileSystemTypeSyncable ||
+      type == kFileSystemTypeSyncableForInternalSync) {
+    return static_cast<SandboxFileSystemBackend*>(
+        backend)->GetUpdateObservers(type);
+  }
+  if (type == kFileSystemTypeTest) {
+    return static_cast<TestFileSystemBackend*>(
+        backend)->GetUpdateObservers(type);
+  }

[kinuko, 2013/07/23 06:41:51]

Can't this be simply written like:

if (backend->GetQuotaUtil())
  return backend->GetQuotaUtil()->GetUpdateObservers(type);
return NULL;

[nhiroki, 2013/07/24 05:58:47]

Done.

+  return NULL;
 }
 
 const AccessObserverList* FileSystemContext::GetAccessObservers(
     FileSystemType type) const {
-  // Currently access observer is only available in SandboxFileSystemBackend.
+  // Currently access observer is only available in SandboxFileSystemBackend and
+  // SyncFileSystemBackend.
   if (sandbox_backend_->CanHandleType(type))
     return sandbox_backend_->GetAccessObservers(type);
+  if (type == kFileSystemTypeSyncable ||
+      type == kFileSystemTypeSyncableForInternalSync) {
+    return static_cast<SandboxFileSystemBackend*>(
+        GetFileSystemBackend(type))->GetAccessObservers(type);
+  }

[kinuko, 2013/07/23 06:41:51]

ditto

[nhiroki, 2013/07/24 05:58:47]

Done.

   return NULL;
 }
 
 void FileSystemContext::GetFileSystemTypes(
     std::vector<FileSystemType>* types) const {
   types->clear();
   for (FileSystemBackendMap::const_iterator iter = backend_map_.begin();
        iter != backend_map_.end(); ++iter)
     types->push_back(iter->first);
 }
@@ skipping 67 matching lines @@
     const FileSystemURL& url,
     int64 offset) {
   if (!url.is_valid())
     return scoped_ptr<FileStreamWriter>();
   FileSystemBackend* backend = GetFileSystemBackend(url.type());
   if (!backend)
     return scoped_ptr<FileStreamWriter>();
   return backend->CreateFileStreamWriter(url, offset, this);
 }
 
+// TODO(nhiroki): Move into SyncFileSystemBackend (http://crbug.com/242422).
 void FileSystemContext::SetLocalFileChangeTracker(
     scoped_ptr<sync_file_system::LocalFileChangeTracker> tracker) {
   DCHECK(!change_tracker_.get());
   DCHECK(tracker.get());
   change_tracker_ = tracker.Pass();
-  sandbox_backend_->AddFileUpdateObserver(
+
+  SandboxFileSystemBackend* backend =
+      static_cast<SandboxFileSystemBackend*>(
+          GetFileSystemBackend(kFileSystemTypeSyncable));
+
+  backend->AddFileUpdateObserver(
       kFileSystemTypeSyncable,
       change_tracker_.get(),
       task_runners_->file_task_runner());
-  sandbox_backend_->AddFileChangeObserver(
+  backend->AddFileChangeObserver(
       kFileSystemTypeSyncable,
       change_tracker_.get(),
       task_runners_->file_task_runner());
 }
 
+// TODO(nhiroki): Move into SyncFileSystemBackend (http://crbug.com/242422).
 void FileSystemContext::set_sync_context(
     sync_file_system::LocalFileSyncContext* sync_context) {
   sync_context_ = sync_context;
 }
 
 FileSystemURL FileSystemContext::CrackURL(const GURL& url) const {
   return CrackFileSystemURL(FileSystemURL(url));
 }
 
 FileSystemURL FileSystemContext::CreateCrackedFileSystemURL(
@@ skipping 96 matching lines @@
     FileSystemType type = static_cast<FileSystemType>(t);
     if (backend->CanHandleType(type)) {
       const bool inserted = backend_map_.insert(
           std::make_pair(type, backend)).second;
       DCHECK(inserted);
     }
   }
 }
 
 }  // namespace fileapi