Collapse fileapi, webkit_blob, webkit_database, quota, and webkit_common namespaces into single sto…

webkit/browser/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/browser/fileapi/file_system_quota_client.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/sequenced_task_runner.h"
 #include "base/single_thread_task_runner.h"
 #include "base/task_runner_util.h"
 #include "net/base/net_util.h"
 #include "url/gurl.h"
 #include "webkit/browser/fileapi/file_system_context.h"
 #include "webkit/browser/fileapi/file_system_quota_util.h"
 #include "webkit/browser/fileapi/file_system_usage_cache.h"
 #include "webkit/browser/fileapi/sandbox_file_system_backend.h"
 #include "webkit/common/fileapi/file_system_util.h"
 
-using quota::StorageType;
+using storage::StorageType;
 
-namespace fileapi {
+namespace storage {
 
 namespace {
 
 void GetOriginsForTypeOnFileTaskRunner(
     FileSystemContext* context,
     StorageType storage_type,
     std::set<GURL>* origins_ptr) {
   FileSystemType type = QuotaStorageTypeToFileSystemType(storage_type);
   DCHECK(type != kFileSystemTypeUnknown);
 
@@ skipping 10 matching lines @@
     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->GetOriginsForHostOnFileTaskRunner(type, host, origins_ptr);
 }
 
-void DidGetOrigins(
-    const quota::QuotaClient::GetOriginsCallback& callback,
-    std::set<GURL>* origins_ptr) {
+void DidGetOrigins(const storage::QuotaClient::GetOriginsCallback& callback,
+                   std::set<GURL>* origins_ptr) {
   callback.Run(*origins_ptr);
 }
 
-quota::QuotaStatusCode DeleteOriginOnFileTaskRunner(
+storage::QuotaStatusCode DeleteOriginOnFileTaskRunner(
     FileSystemContext* context,
     const GURL& origin,
     FileSystemType type) {
   FileSystemBackend* provider = context->GetFileSystemBackend(type);
   if (!provider || !provider->GetQuotaUtil())
-    return quota::kQuotaErrorNotSupported;
+    return storage::kQuotaErrorNotSupported;
   base::File::Error result =
       provider->GetQuotaUtil()->DeleteOriginDataOnFileTaskRunner(
           context, context->quota_manager_proxy(), origin, type);
   if (result == base::File::FILE_OK)
-    return quota::kQuotaStatusOk;
-  return quota::kQuotaErrorInvalidModification;
+    return storage::kQuotaStatusOk;
+  return storage::kQuotaErrorInvalidModification;
 }
 
 }  // namespace
 
 FileSystemQuotaClient::FileSystemQuotaClient(
     FileSystemContext* file_system_context,
     bool is_incognito)
     : file_system_context_(file_system_context),
       is_incognito_(is_incognito) {
 }
 
 FileSystemQuotaClient::~FileSystemQuotaClient() {}
 
-quota::QuotaClient::ID FileSystemQuotaClient::id() const {
-  return quota::QuotaClient::kFileSystem;
+storage::QuotaClient::ID FileSystemQuotaClient::id() const {
+  return storage::QuotaClient::kFileSystem;
 }
 
 void FileSystemQuotaClient::OnQuotaManagerDestroyed() {
   delete this;
 }
 
 void FileSystemQuotaClient::GetOriginUsage(
     const GURL& origin_url,
     StorageType storage_type,
     const GetUsageCallback& callback) {
@@ skipping 86 matching lines @@
   base::PostTaskAndReplyWithResult(
       file_task_runner(),
       FROM_HERE,
       base::Bind(&DeleteOriginOnFileTaskRunner,
                  file_system_context_,
                  origin,
                  fs_type),
       callback);
 }
 
-bool FileSystemQuotaClient::DoesSupport(quota::StorageType storage_type) const {
+bool FileSystemQuotaClient::DoesSupport(
+    storage::StorageType storage_type) const {
   FileSystemType type = QuotaStorageTypeToFileSystemType(storage_type);
   DCHECK(type != kFileSystemTypeUnknown);
   return file_system_context_->IsSandboxFileSystem(type);
 }
 
 base::SequencedTaskRunner* FileSystemQuotaClient::file_task_runner() const {
   return file_system_context_->default_file_task_runner();
 }
 
-}  // namespace fileapi
+}  // namespace storage