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

webkit/browser/database/database_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/database/database_quota_client.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/location.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/task_runner_util.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
 #include "webkit/browser/database/database_tracker.h"
 #include "webkit/browser/database/database_util.h"
 #include "webkit/common/database/database_identifier.h"
 
-using quota::QuotaClient;
+using storage::QuotaClient;
 
-namespace webkit_database {
+namespace storage {
 
 namespace {
 
 int64 GetOriginUsageOnDBThread(
     DatabaseTracker* db_tracker,
     const GURL& origin_url) {
   OriginInfo info;
-  if (db_tracker->GetOriginInfo(
-          webkit_database::GetIdentifierFromOrigin(origin_url), &info))
+  if (db_tracker->GetOriginInfo(storage::GetIdentifierFromOrigin(origin_url),
+                                &info))
     return info.TotalSize();
   return 0;
 }
 
 void GetOriginsOnDBThread(
     DatabaseTracker* db_tracker,
     std::set<GURL>* origins_ptr) {
   std::vector<std::string> origin_identifiers;
   if (db_tracker->GetAllOriginIdentifiers(&origin_identifiers)) {
     for (std::vector<std::string>::const_iterator iter =
          origin_identifiers.begin();
          iter != origin_identifiers.end(); ++iter) {
-      GURL origin = webkit_database::GetOriginFromIdentifier(*iter);
+      GURL origin = storage::GetOriginFromIdentifier(*iter);
       origins_ptr->insert(origin);
     }
   }
 }
 
 void GetOriginsForHostOnDBThread(
     DatabaseTracker* db_tracker,
     std::set<GURL>* origins_ptr,
     const std::string& host) {
   std::vector<std::string> origin_identifiers;
   if (db_tracker->GetAllOriginIdentifiers(&origin_identifiers)) {
     for (std::vector<std::string>::const_iterator iter =
          origin_identifiers.begin();
          iter != origin_identifiers.end(); ++iter) {
-      GURL origin = webkit_database::GetOriginFromIdentifier(*iter);
+      GURL origin = storage::GetOriginFromIdentifier(*iter);
       if (host == net::GetHostOrSpecFromURL(origin))
         origins_ptr->insert(origin);
     }
   }
 }
 
 void DidGetOrigins(
     const QuotaClient::GetOriginsCallback& callback,
     std::set<GURL>* origins_ptr) {
   callback.Run(*origins_ptr);
 }
 
 void DidDeleteOriginData(
     base::SingleThreadTaskRunner* original_task_runner,
     const QuotaClient::DeletionCallback& callback,
     int result) {
   if (result == net::ERR_IO_PENDING) {
     // The callback will be invoked via
     // DatabaseTracker::ScheduleDatabasesForDeletion.
     return;
   }
 
-  quota::QuotaStatusCode status;
+  storage::QuotaStatusCode status;
   if (result == net::OK)
-    status = quota::kQuotaStatusOk;
+    status = storage::kQuotaStatusOk;
   else
-    status = quota::kQuotaStatusUnknown;
+    status = storage::kQuotaStatusUnknown;
 
   if (original_task_runner->BelongsToCurrentThread())
     callback.Run(status);
   else
     original_task_runner->PostTask(FROM_HERE, base::Bind(callback, status));
 }
 
 }  // namespace
 
 DatabaseQuotaClient::DatabaseQuotaClient(
@@ skipping 14 matching lines @@
 }
 
 QuotaClient::ID DatabaseQuotaClient::id() const {
   return kDatabase;
 }
 
 void DatabaseQuotaClient::OnQuotaManagerDestroyed() {
   delete this;
 }
 
-void DatabaseQuotaClient::GetOriginUsage(
-    const GURL& origin_url,
-    quota::StorageType type,
-    const GetUsageCallback& callback) {
+void DatabaseQuotaClient::GetOriginUsage(const GURL& origin_url,
+                                         storage::StorageType type,
+                                         const GetUsageCallback& callback) {
   DCHECK(!callback.is_null());
   DCHECK(db_tracker_.get());
 
   // All databases are in the temp namespace for now.
-  if (type != quota::kStorageTypeTemporary) {
+  if (type != storage::kStorageTypeTemporary) {
     callback.Run(0);
     return;
   }
 
   base::PostTaskAndReplyWithResult(
       db_tracker_thread_.get(),
       FROM_HERE,
       base::Bind(&GetOriginUsageOnDBThread, db_tracker_, origin_url),
       callback);
 }
 
 void DatabaseQuotaClient::GetOriginsForType(
-    quota::StorageType type,
+    storage::StorageType type,
     const GetOriginsCallback& callback) {
   DCHECK(!callback.is_null());
   DCHECK(db_tracker_.get());
 
   // All databases are in the temp namespace for now.
-  if (type != quota::kStorageTypeTemporary) {
+  if (type != storage::kStorageTypeTemporary) {
     callback.Run(std::set<GURL>());
     return;
   }
 
   std::set<GURL>* origins_ptr = new std::set<GURL>();
   db_tracker_thread_->PostTaskAndReply(
       FROM_HERE,
       base::Bind(&GetOriginsOnDBThread,
                  db_tracker_,
                  base::Unretained(origins_ptr)),
       base::Bind(&DidGetOrigins,
                  callback,
                  base::Owned(origins_ptr)));
 }
 
 void DatabaseQuotaClient::GetOriginsForHost(
-    quota::StorageType type,
+    storage::StorageType type,
     const std::string& host,
     const GetOriginsCallback& callback) {
   DCHECK(!callback.is_null());
   DCHECK(db_tracker_.get());
 
   // All databases are in the temp namespace for now.
-  if (type != quota::kStorageTypeTemporary) {
+  if (type != storage::kStorageTypeTemporary) {
     callback.Run(std::set<GURL>());
     return;
   }
 
   std::set<GURL>* origins_ptr = new std::set<GURL>();
   db_tracker_thread_->PostTaskAndReply(
       FROM_HERE,
       base::Bind(&GetOriginsForHostOnDBThread,
                  db_tracker_,
                  base::Unretained(origins_ptr),
                  host),
       base::Bind(&DidGetOrigins,
                  callback,
                  base::Owned(origins_ptr)));
 }
 
-void DatabaseQuotaClient::DeleteOriginData(
-    const GURL& origin,
-    quota::StorageType type,
-    const DeletionCallback& callback) {
+void DatabaseQuotaClient::DeleteOriginData(const GURL& origin,
+                                           storage::StorageType type,
+                                           const DeletionCallback& callback) {
   DCHECK(!callback.is_null());
   DCHECK(db_tracker_.get());
 
   // All databases are in the temp namespace for now, so nothing to delete.
-  if (type != quota::kStorageTypeTemporary) {
-    callback.Run(quota::kQuotaStatusOk);
+  if (type != storage::kStorageTypeTemporary) {
+    callback.Run(storage::kQuotaStatusOk);
     return;
   }
 
   base::Callback<void(int)> delete_callback =
       base::Bind(&DidDeleteOriginData,
                  base::MessageLoopProxy::current(),
                  callback);
 
   PostTaskAndReplyWithResult(
       db_tracker_thread_.get(),
       FROM_HERE,
       base::Bind(&DatabaseTracker::DeleteDataForOrigin,
                  db_tracker_,
-                 webkit_database::GetIdentifierFromOrigin(origin),
+                 storage::GetIdentifierFromOrigin(origin),
                  delete_callback),
       delete_callback);
 }
 
-bool DatabaseQuotaClient::DoesSupport(quota::StorageType type) const {
-  return type == quota::kStorageTypeTemporary;
+bool DatabaseQuotaClient::DoesSupport(storage::StorageType type) const {
+  return type == storage::kStorageTypeTemporary;
 }
 
-}  // namespace webkit_database
+}  // namespace storage