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

chrome/browser/browsing_data/browsing_data_database_helper.h

 // 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.
 
 #ifndef CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_DATABASE_HELPER_H_
 #define CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_DATABASE_HELPER_H_
 
 #include <list>
 #include <set>
 #include <string>
@@ skipping 12 matching lines @@
 // This class fetches database information in the FILE thread, and notifies
 // the UI thread upon completion.
 // A client of this class need to call StartFetching from the UI thread to
 // initiate the flow, and it'll be notified by the callback in its UI
 // thread at some later point.
 class BrowsingDataDatabaseHelper
     : public base::RefCountedThreadSafe<BrowsingDataDatabaseHelper> {
  public:
   // Contains detailed information about a web database.
   struct DatabaseInfo {
-    DatabaseInfo(const webkit_database::DatabaseIdentifier& identifier,
+    DatabaseInfo(const storage::DatabaseIdentifier& identifier,
                  const std::string& database_name,
                  const std::string& description,
                  int64 size,
                  base::Time last_modified);
     ~DatabaseInfo();
 
-    webkit_database::DatabaseIdentifier identifier;
+    storage::DatabaseIdentifier identifier;
     std::string database_name;
     std::string description;
     int64 size;
     base::Time last_modified;
   };
 
   explicit BrowsingDataDatabaseHelper(Profile* profile);
 
   // Starts the fetching process, which will notify its completion via
   // callback.
@@ skipping 31 matching lines @@
   bool is_fetching_;
 
  private:
   // Enumerates all databases. This must be called in the FILE thread.
   void FetchDatabaseInfoOnFileThread();
 
   // Delete a single database file. This must be called in the FILE thread.
   void DeleteDatabaseOnFileThread(const std::string& origin,
                                   const std::string& name);
 
-  scoped_refptr<webkit_database::DatabaseTracker> tracker_;
+  scoped_refptr<storage::DatabaseTracker> tracker_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowsingDataDatabaseHelper);
 };
 
 // This class is a thin wrapper around BrowsingDataDatabaseHelper that does not
 // fetch its information from the database tracker, but gets them passed as
 // a parameter during construction.
 class CannedBrowsingDataDatabaseHelper : public BrowsingDataDatabaseHelper {
  public:
   struct PendingDatabaseInfo {
@@ skipping 46 matching lines @@
   virtual ~CannedBrowsingDataDatabaseHelper();
 
   std::set<PendingDatabaseInfo> pending_database_info_;
 
   Profile* profile_;
 
   DISALLOW_COPY_AND_ASSIGN(CannedBrowsingDataDatabaseHelper);
 };
 
 #endif  // CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_DATABASE_HELPER_H_