Clean up FileSystemQuotaClient.

webkit/fileapi/file_system_quota_client.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_quota_client.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/bind.h"
@@ skipping 13 matching lines @@
 #include "webkit/fileapi/file_system_usage_cache.h"
 #include "webkit/fileapi/file_system_util.h"
 #include "webkit/fileapi/sandbox_mount_point_provider.h"
 
 using quota::StorageType;
 
 namespace fileapi {
 
 namespace {
 
-void GetOriginsForTypeOnFileThread(FileSystemContext* context,
-                                   StorageType storage_type,
-                                   std::set<GURL>* origins_ptr) {
+void GetOriginsForTypeOnFileThread(
+    FileSystemContext* context,
+    StorageType storage_type,
+    std::set<GURL>* origins_ptr) {
   FileSystemType type = QuotaStorageTypeToFileSystemType(storage_type);
   DCHECK(type != kFileSystemTypeUnknown);
 
   FileSystemQuotaUtil* quota_util = context->GetQuotaUtil(type);
   if (!quota_util)
     return;
   quota_util->GetOriginsForTypeOnFileThread(type, origins_ptr);
 }
 
-void GetOriginsForHostOnFileThread(FileSystemContext* context,
-                                   StorageType storage_type,
-                                   const std::string& host,
-                                   std::set<GURL>* origins_ptr) {
+void GetOriginsForHostOnFileThread(
+    FileSystemContext* context,
+    StorageType storage_type,
+    const std::string& host,
+    std::set<GURL>* origins_ptr) {
   FileSystemType type = QuotaStorageTypeToFileSystemType(storage_type);
   DCHECK(type != kFileSystemTypeUnknown);
 
   FileSystemQuotaUtil* quota_util = context->GetQuotaUtil(type);
   if (!quota_util)
     return;
   quota_util->GetOriginsForHostOnFileThread(type, host, origins_ptr);
 }
 
 void DidGetOrigins(
-    const base::Callback<void(const std::set<GURL>&, StorageType)>& callback,
+    const quota::QuotaClient::GetOriginsCallback& callback,
     std::set<GURL>* origins_ptr,
     StorageType storage_type) {
   callback.Run(*origins_ptr, storage_type);
 }
 
-quota::QuotaStatusCode DeleteOriginOnTargetThread(
+quota::QuotaStatusCode DeleteOriginOnFileThread(
     FileSystemContext* context,
     const GURL& origin,
     FileSystemType type) {
   base::PlatformFileError result =
       context->sandbox_provider()->DeleteOriginDataOnFileThread(
           context, context->quota_manager_proxy(), origin, type);
   if (result == base::PLATFORM_FILE_OK)
     return quota::kQuotaStatusOk;
   return quota::kQuotaErrorInvalidModification;
 }
@@ skipping 95 matching lines @@
                  file_system_context_,
                  storage_type,
                  host,
                  base::Unretained(origins_ptr)),
       base::Bind(&DidGetOrigins,
                  callback,
                  base::Owned(origins_ptr),
                  storage_type));
 }
 
-void FileSystemQuotaClient::DeleteOriginData(const GURL& origin,
-                                             StorageType type,
-                                             const DeletionCallback& callback) {
+void FileSystemQuotaClient::DeleteOriginData(
+    const GURL& origin,
+    StorageType type,
+    const DeletionCallback& callback) {
   FileSystemType fs_type = QuotaStorageTypeToFileSystemType(type);
   DCHECK(fs_type != kFileSystemTypeUnknown);
 
   base::PostTaskAndReplyWithResult(
       file_task_runner(),
       FROM_HERE,
-      base::Bind(&DeleteOriginOnTargetThread,
+      base::Bind(&DeleteOriginOnFileThread,
                  file_system_context_,
                  origin,
                  fs_type),
       callback);
 }
 
 base::SequencedTaskRunner* FileSystemQuotaClient::file_task_runner() const {
   return file_system_context_->task_runners()->file_task_runner();
 }
 
 }  // namespace fileapi