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

chrome/browser/browsing_data/browsing_data_database_helper.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 "chrome/browser/browsing_data/browsing_data_database_helper.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/file_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/storage_partition.h"
 #include "net/base/completion_callback.h"
 #include "net/base/net_errors.h"
 #include "webkit/common/database/database_identifier.h"
 
 using content::BrowserContext;
 using content::BrowserThread;
-using webkit_database::DatabaseIdentifier;
+using storage::DatabaseIdentifier;
 
 BrowsingDataDatabaseHelper::DatabaseInfo::DatabaseInfo(
     const DatabaseIdentifier& identifier,
     const std::string& database_name,
     const std::string& description,
     int64 size,
     base::Time last_modified)
     : identifier(identifier),
       database_name(database_name),
       description(description),
@@ skipping 31 matching lines @@
                                                 const std::string& name) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       base::Bind(&BrowsingDataDatabaseHelper::DeleteDatabaseOnFileThread, this,
                  origin, name));
 }
 
 void BrowsingDataDatabaseHelper::FetchDatabaseInfoOnFileThread() {
   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
-  std::vector<webkit_database::OriginInfo> origins_info;
+  std::vector<storage::OriginInfo> origins_info;
   if (tracker_.get() && tracker_->GetAllOriginsInfo(&origins_info)) {
-    for (std::vector<webkit_database::OriginInfo>::const_iterator ori =
-         origins_info.begin(); ori != origins_info.end(); ++ori) {
+    for (std::vector<storage::OriginInfo>::const_iterator ori =
+             origins_info.begin();
+         ori != origins_info.end();
+         ++ori) {
       DatabaseIdentifier identifier =
           DatabaseIdentifier::Parse(ori->GetOriginIdentifier());
       if (!BrowsingDataHelper::HasWebScheme(identifier.ToOrigin())) {
         // Non-websafe state is not considered browsing data.
         continue;
       }
       std::vector<base::string16> databases;
       ori->GetAllDatabaseNames(&databases);
       for (std::vector<base::string16>::const_iterator db = databases.begin();
            db != databases.end(); ++db) {
@@ skipping 121 matching lines @@
   }
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE, base::Bind(callback, result));
 }
 
 void CannedBrowsingDataDatabaseHelper::DeleteDatabase(
     const std::string& origin_identifier,
     const std::string& name) {
   GURL origin =
-      webkit_database::DatabaseIdentifier::Parse(origin_identifier).ToOrigin();
+      storage::DatabaseIdentifier::Parse(origin_identifier).ToOrigin();
   for (std::set<PendingDatabaseInfo>::iterator it =
            pending_database_info_.begin();
        it != pending_database_info_.end();
        ++it) {
     if (it->origin == origin && it->name == name) {
       pending_database_info_.erase(it);
       break;
     }
   }
   BrowsingDataDatabaseHelper::DeleteDatabase(origin_identifier, name);
 }
 
 CannedBrowsingDataDatabaseHelper::~CannedBrowsingDataDatabaseHelper() {}