Wire up the deleteFileSystem operation.

webkit/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/fileapi/file_system_context.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/stl_util.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 18 matching lines @@
 namespace fileapi {
 
 namespace {
 
 QuotaClient* CreateQuotaClient(
     FileSystemContext* context,
     bool is_incognito) {
   return new FileSystemQuotaClient(context, is_incognito);
 }
 
-void DidOpenFileSystem(FileSystemContext::OpenFileSystemCallback callback,
-                       const GURL& filesystem_root,
-                       const std::string& filesystem_name,
-                       base::PlatformFileError error) {
+void DidOpenFileSystem(
+    const FileSystemContext::OpenFileSystemCallback& callback,
+    const GURL& filesystem_root,
+    const std::string& filesystem_name,
+    base::PlatformFileError error) {
   callback.Run(error, filesystem_name, filesystem_root);
 }
 
 }  // anonymous namespace
 
 FileSystemContext::FileSystemContext(
     base::SequencedTaskRunner* file_task_runner,
     base::SingleThreadTaskRunner* io_task_runner,
     quota::SpecialStoragePolicy* special_storage_policy,
     quota::QuotaManagerProxy* quota_manager_proxy,
@@ skipping 18 matching lines @@
 #endif
 }
 
 bool FileSystemContext::DeleteDataForOriginOnFileThread(
     const GURL& origin_url) {
   DCHECK(file_task_runner_->RunsTasksOnCurrentThread());
   DCHECK(sandbox_provider());
 
   // Delete temporary and persistent data.
   return
-      sandbox_provider()->DeleteOriginDataOnFileThread(
-          this, quota_manager_proxy(), origin_url, kFileSystemTypeTemporary) &&
-      sandbox_provider()->DeleteOriginDataOnFileThread(
-          this, quota_manager_proxy(), origin_url, kFileSystemTypePersistent);
-}
-
-bool FileSystemContext::DeleteDataForOriginAndTypeOnFileThread(
-    const GURL& origin_url, FileSystemType type) {
-  DCHECK(file_task_runner_->RunsTasksOnCurrentThread());
-  if (type == fileapi::kFileSystemTypeTemporary ||
-      type == fileapi::kFileSystemTypePersistent) {
-    DCHECK(sandbox_provider());
-    return sandbox_provider()->DeleteOriginDataOnFileThread(
-        this, quota_manager_proxy(), origin_url, type);
-  }
-  return false;
+      (sandbox_provider()->DeleteOriginDataOnFileThread(
+          this, quota_manager_proxy(), origin_url, kFileSystemTypeTemporary) ==
+       base::PLATFORM_FILE_OK) &&
+      (sandbox_provider()->DeleteOriginDataOnFileThread(
+          this, quota_manager_proxy(), origin_url, kFileSystemTypePersistent) ==
+       base::PLATFORM_FILE_OK);
 }
 
 FileSystemQuotaUtil*
 FileSystemContext::GetQuotaUtil(FileSystemType type) const {
   FileSystemMountPointProvider* mount_point_provider =
       GetMountPointProvider(type);
   if (!mount_point_provider)
     return NULL;
   return mount_point_provider->GetQuotaUtil();
 }
@@ skipping 35 matching lines @@
 
 ExternalFileSystemMountPointProvider*
 FileSystemContext::external_provider() const {
   return external_provider_.get();
 }
 
 void FileSystemContext::OpenFileSystem(
     const GURL& origin_url,
     FileSystemType type,
     bool create,
-    OpenFileSystemCallback callback) {
+    const OpenFileSystemCallback& callback) {
   DCHECK(!callback.is_null());
 
   FileSystemMountPointProvider* mount_point_provider =
       GetMountPointProvider(type);
   if (!mount_point_provider) {
     callback.Run(base::PLATFORM_FILE_ERROR_SECURITY, std::string(), GURL());
     return;
   }
 
   GURL root_url = GetFileSystemRootURI(origin_url, type);
   std::string name = GetFileSystemName(origin_url, type);
 
   mount_point_provider->ValidateFileSystemRoot(
       origin_url, type, create,
       base::Bind(&DidOpenFileSystem, callback, root_url, name));
 }
 
+void FileSystemContext::DeleteFileSystem(
+    const GURL& origin_url,
+    FileSystemType type,
+    const DeleteFileSystemCallback& callback) {
+  FileSystemMountPointProvider* mount_point_provider =
+      GetMountPointProvider(type);
+  if (!mount_point_provider) {
+    callback.Run(base::PLATFORM_FILE_ERROR_SECURITY);
+    return;
+  }
+
+  mount_point_provider->DeleteFileSystem(origin_url, type, this, callback);
+}
+
 FileSystemOperationInterface* FileSystemContext::CreateFileSystemOperation(
     const FileSystemURL& url) {
   if (!url.is_valid())
     return NULL;
   FileSystemMountPointProvider* mount_point_provider =
       GetMountPointProvider(url.type());
   if (!mount_point_provider)
     return NULL;
   return mount_point_provider->CreateFileSystemOperation(url, this);
 }
@@ skipping 24 matching lines @@
   if (!io_task_runner_->RunsTasksOnCurrentThread() &&
       io_task_runner_->DeleteSoon(FROM_HERE, this)) {
     return;
   }
   STLDeleteContainerPairSecondPointers(provider_map_.begin(),
                                        provider_map_.end());
   delete this;
 }
 
 }  // namespace fileapi