SyncFS: Introduce SyncFileSystemBackend

webkit/browser/fileapi/sandbox_file_system_backend.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/sandbox_file_system_backend.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
@@ skipping 46 matching lines @@
   kIncognito,
   kInvalidSchemeError,
   kCreateDirectoryError,
   kNotFound,
   kUnknownError,
   kFileSystemErrorMax,
 };
 
 const char kTemporaryOriginsCountLabel[] = "FileSystem.TemporaryOriginsCount";
 const char kPersistentOriginsCountLabel[] = "FileSystem.PersistentOriginsCount";
-const char kSyncableOriginsCountLabel[] = "FileSystem.SyncableOriginsCount";
 
 // Restricted names.
 // http://dev.w3.org/2009/dap/file-system/file-dir-sys.html#naming-restrictions
 const base::FilePath::CharType* const kRestrictedNames[] = {
   FILE_PATH_LITERAL("."), FILE_PATH_LITERAL(".."),
 };
 
 // Restricted chars.
 const base::FilePath::CharType kRestrictedChars[] = {
   FILE_PATH_LITERAL('/'), FILE_PATH_LITERAL('\\'),
@@ skipping 13 matching lines @@
 
   virtual bool HasFileSystemType(fileapi::FileSystemType type) const OVERRIDE {
     return enum_->HasFileSystemType(type);
   }
 
  private:
   scoped_ptr<ObfuscatedFileUtil::AbstractOriginEnumerator> enum_;
 };
 
 void DidOpenFileSystem(
-    base::WeakPtr<SandboxFileSystemBackend> mount_point_provider,
+    base::WeakPtr<SandboxFileSystemBackend> file_system_backend,
     const base::Callback<void(base::PlatformFileError error)>& callback,
     base::PlatformFileError* error) {
-  if (mount_point_provider.get())
-    mount_point_provider.get()->CollectOpenFileSystemMetrics(*error);
+  if (file_system_backend.get())
+    file_system_backend.get()->CollectOpenFileSystemMetrics(*error);
   callback.Run(*error);
 }
 
 void OpenFileSystemOnFileThread(
     ObfuscatedFileUtil* file_util,
     const GURL& origin_url,
     FileSystemType type,
     OpenFileSystemMode mode,
     base::PlatformFileError* error_ptr) {
   DCHECK(error_ptr);
@@ skipping 19 matching lines @@
 SandboxFileSystemBackend::SandboxFileSystemBackend(
     SandboxContext* sandbox_context,
     const FileSystemOptions& file_system_options)
     : file_system_options_(file_system_options),
       sandbox_context_(sandbox_context),
       enable_temporary_file_system_in_incognito_(false),
       enable_usage_tracking_(
           !CommandLine::ForCurrentProcess()->HasSwitch(
               kDisableUsageTracking)),
       weak_factory_(this) {
+  // SyncFileSystemBackend is instantiated with null context.
+  if (!sandbox_context)
+    return;
+
   // Set quota observers.
   if (enable_usage_tracking_) {
     update_observers_ = update_observers_.AddObserver(
         sandbox_context_->quota_observer(),
         sandbox_context_->file_task_runner());
     access_observers_ = access_observers_.AddObserver(
         sandbox_context_->quota_observer(), NULL);
   }
 
-  syncable_update_observers_ = update_observers_;
-
   if (!sandbox_context_->file_task_runner()->RunsTasksOnCurrentThread()) {
     // Post prepopulate task only if it's not already running on
     // file_task_runner (which implies running in tests).
     sandbox_context_->file_task_runner()->PostTask(
         FROM_HERE,
         base::Bind(&ObfuscatedFileUtil::MaybePrepopulateDatabase,
                   base::Unretained(sandbox_sync_file_util())));
   }

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

It'd be more consistent to move all sandbox_context related initialization into
Initialize()?

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

Done in the separate CL.

 }
 
 SandboxFileSystemBackend::~SandboxFileSystemBackend() {
 }
 
 bool SandboxFileSystemBackend::CanHandleType(FileSystemType type) const {
   return type == kFileSystemTypeTemporary ||
-         type == kFileSystemTypePersistent ||
-         type == kFileSystemTypeSyncable ||
-         type == kFileSystemTypeSyncableForInternalSync;
+         type == kFileSystemTypePersistent;
+}
+
+void SandboxFileSystemBackend::Initialize(const FileSystemContext* context) {
 }
 
 void SandboxFileSystemBackend::InitializeFileSystem(
     const GURL& origin_url,
     fileapi::FileSystemType type,
     OpenFileSystemMode mode,
     FileSystemContext* context,
     const InitializeFileSystemCallback& callback) {
   if (file_system_options_.is_incognito() &&
       !(type == kFileSystemTypeTemporary &&
@@ skipping 69 matching lines @@
     const FileSystemURL& url,
     FileSystemContext* context,
     base::PlatformFileError* error_code) const {
   if (!IsAccessValid(url)) {
     *error_code = base::PLATFORM_FILE_ERROR_SECURITY;
     return NULL;
   }
 
   scoped_ptr<FileSystemOperationContext> operation_context(
       new FileSystemOperationContext(context));
-
-  // Copy the observer lists (assuming we only have small number of observers).
-  if (url.type() == kFileSystemTypeSyncable) {
-    operation_context->set_update_observers(syncable_update_observers_);
-    operation_context->set_change_observers(syncable_change_observers_);
-    return new sync_file_system::SyncableFileSystemOperation(
-        url, context, operation_context.Pass());
-  }
-
-  // For regular sandboxed types.
   operation_context->set_update_observers(update_observers_);
   operation_context->set_change_observers(change_observers_);
 
   SpecialStoragePolicy* policy = sandbox_context_->special_storage_policy();
   if (policy && policy->IsStorageUnlimited(url.origin()))
     operation_context->set_quota_limit_type(quota::kQuotaLimitTypeUnlimited);
   else
     operation_context->set_quota_limit_type(quota::kQuotaLimitTypeLimited);
 
   return new LocalFileSystemOperation(url, context, operation_context.Pass());
@@ skipping 77 matching lines @@
     if (enumerator->HasFileSystemType(type))
       origins->insert(origin);
   }
   switch (type) {
     case kFileSystemTypeTemporary:
       UMA_HISTOGRAM_COUNTS(kTemporaryOriginsCountLabel, origins->size());
       break;
     case kFileSystemTypePersistent:
       UMA_HISTOGRAM_COUNTS(kPersistentOriginsCountLabel, origins->size());
       break;
-    case kFileSystemTypeSyncable:
-      UMA_HISTOGRAM_COUNTS(kSyncableOriginsCountLabel, origins->size());
-      break;
     default:
       break;
   }
 }
 
 void SandboxFileSystemBackend::GetOriginsForHostOnFileThread(
     fileapi::FileSystemType type, const std::string& host,
     std::set<GURL>* origins) {
   DCHECK(CanHandleType(type));
   DCHECK(origins);
@@ skipping 68 matching lines @@
   sandbox_context_->quota_observer()->SetUsageCacheEnabled(origin, type, false);
   InvalidateUsageCache(origin, type);
 }
 
 void SandboxFileSystemBackend::AddFileUpdateObserver(
     FileSystemType type,
     FileUpdateObserver* observer,
     base::SequencedTaskRunner* task_runner) {
   DCHECK(CanHandleType(type));
   UpdateObserverList* list = &update_observers_;
-  if (type == kFileSystemTypeSyncable)
-    list = &syncable_update_observers_;
   *list = list->AddObserver(observer, task_runner);
 }
 
 void SandboxFileSystemBackend::AddFileChangeObserver(
     FileSystemType type,
     FileChangeObserver* observer,
     base::SequencedTaskRunner* task_runner) {
   DCHECK(CanHandleType(type));
   ChangeObserverList* list = &change_observers_;
-  if (type == kFileSystemTypeSyncable)
-    list = &syncable_change_observers_;
   *list = list->AddObserver(observer, task_runner);
 }
 
 void SandboxFileSystemBackend::AddFileAccessObserver(
     FileSystemType type,
     FileAccessObserver* observer,
     base::SequencedTaskRunner* task_runner) {
   DCHECK(CanHandleType(type));
   access_observers_ = access_observers_.AddObserver(observer, task_runner);
 }
 
 const UpdateObserverList* SandboxFileSystemBackend::GetUpdateObservers(
     FileSystemType type) const {
   DCHECK(CanHandleType(type));
-  if (type == kFileSystemTypeSyncable)
-    return &syncable_update_observers_;
   return &update_observers_;
 }
 
 const ChangeObserverList* SandboxFileSystemBackend::GetChangeObservers(
     FileSystemType type) const {
   DCHECK(CanHandleType(type));
-  if (type == kFileSystemTypeSyncable)
-    return &syncable_change_observers_;
   return &change_observers_;
 }
 
 const AccessObserverList* SandboxFileSystemBackend::GetAccessObservers(
     FileSystemType type) const {
   DCHECK(CanHandleType(type));
   return &access_observers_;
 }
 
 void SandboxFileSystemBackend::CollectOpenFileSystemMetrics(
@@ skipping 150 matching lines @@
 
   while (!(file_path_each = enumerator->Next()).empty()) {
     usage += enumerator->Size();
     usage += ObfuscatedFileUtil::ComputeFilePathCost(file_path_each);
   }
 
   return usage;
 }
 
 }  // namespace fileapi