Move storage-related files from webkit/ to new top-level directory storage/

storage/browser/database/database_quota_client.cc

Index: storage/browser/database/database_quota_client.cc
diff --git a/webkit/browser/database/database_quota_client.cc b/storage/browser/database/database_quota_client.cc
similarity index 70%
rename from webkit/browser/database/database_quota_client.cc
rename to storage/browser/database/database_quota_client.cc
index 08e86660375230e12807657d1fa23524f638f161..c76ed4ac305ba5de3d95e43b8f9d3ab2aaac1509 100644
--- a/webkit/browser/database/database_quota_client.cc
+++ b/storage/browser/database/database_quota_client.cc
@@ -2,7 +2,7 @@
 // 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 "storage/browser/database/database_quota_client.h"
 
 #include <vector>
 
@@ -14,9 +14,9 @@
 #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"
+#include "storage/browser/database/database_tracker.h"
+#include "storage/browser/database/database_util.h"
+#include "storage/common/database/database_identifier.h"
 
 using quota::QuotaClient;
 
@@ -24,9 +24,8 @@ namespace webkit_database {
 
 namespace {
 
-int64 GetOriginUsageOnDBThread(
-    DatabaseTracker* db_tracker,
-    const GURL& origin_url) {
+int64 GetOriginUsageOnDBThread(DatabaseTracker* db_tracker,
+                               const GURL& origin_url) {
   OriginInfo info;
   if (db_tracker->GetOriginInfo(
           webkit_database::GetIdentifierFromOrigin(origin_url), &info))
@@ -34,29 +33,29 @@ int64 GetOriginUsageOnDBThread(
   return 0;
 }
 
-void GetOriginsOnDBThread(
-    DatabaseTracker* db_tracker,
-    std::set<GURL>* origins_ptr) {
+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) {
+             origin_identifiers.begin();
+         iter != origin_identifiers.end();
+         ++iter) {
       GURL origin = webkit_database::GetOriginFromIdentifier(*iter);
       origins_ptr->insert(origin);
     }
   }
 }
 
-void GetOriginsForHostOnDBThread(
-    DatabaseTracker* db_tracker,
-    std::set<GURL>* origins_ptr,
-    const std::string& host) {
+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) {
+             origin_identifiers.begin();
+         iter != origin_identifiers.end();
+         ++iter) {
       GURL origin = webkit_database::GetOriginFromIdentifier(*iter);
       if (host == net::GetHostOrSpecFromURL(origin))
         origins_ptr->insert(origin);
@@ -64,16 +63,14 @@ void GetOriginsForHostOnDBThread(
   }
 }
 
-void DidGetOrigins(
-    const QuotaClient::GetOriginsCallback& callback,
-    std::set<GURL>* origins_ptr) {
+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) {
+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.
@@ -119,10 +116,9 @@ 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,
+                                         quota::StorageType type,
+                                         const GetUsageCallback& callback) {
   DCHECK(!callback.is_null());
   DCHECK(db_tracker_.get());
 
@@ -154,12 +150,9 @@ void DatabaseQuotaClient::GetOriginsForType(
   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)));
+      base::Bind(
+          &GetOriginsOnDBThread, db_tracker_, base::Unretained(origins_ptr)),
+      base::Bind(&DidGetOrigins, callback, base::Owned(origins_ptr)));
 }
 
 void DatabaseQuotaClient::GetOriginsForHost(
@@ -182,15 +175,12 @@ void DatabaseQuotaClient::GetOriginsForHost(
                  db_tracker_,
                  base::Unretained(origins_ptr),
                  host),
-      base::Bind(&DidGetOrigins,
-                 callback,
-                 base::Owned(origins_ptr)));
+      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,
+                                           quota::StorageType type,
+                                           const DeletionCallback& callback) {
   DCHECK(!callback.is_null());
   DCHECK(db_tracker_.get());
 
@@ -200,10 +190,8 @@ void DatabaseQuotaClient::DeleteOriginData(
     return;
   }
 
-  base::Callback<void(int)> delete_callback =
-      base::Bind(&DidDeleteOriginData,
-                 base::MessageLoopProxy::current(),
-                 callback);
+  base::Callback<void(int)> delete_callback = base::Bind(
+      &DidDeleteOriginData, base::MessageLoopProxy::current(), callback);
 
   PostTaskAndReplyWithResult(
       db_tracker_thread_.get(),