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

webkit/browser/database/database_tracker.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 WEBKIT_BROWSER_DATABASE_DATABASE_TRACKER_H_
 #define WEBKIT_BROWSER_DATABASE_DATABASE_TRACKER_H_
 
 #include <map>
 #include <set>
 #include <utility>
@@ skipping 18 matching lines @@
 namespace content {
 class DatabaseTracker_TestHelper_Test;
 class MockDatabaseTracker;
 }
 
 namespace sql {
 class Connection;
 class MetaTable;
 }
 
-namespace quota {
+namespace storage {
 class QuotaManagerProxy;
 class SpecialStoragePolicy;
 }
 
-namespace webkit_database {
+namespace storage {
 
 WEBKIT_STORAGE_BROWSER_EXPORT extern const base::FilePath::CharType
     kDatabaseDirectoryName[];
 WEBKIT_STORAGE_BROWSER_EXPORT extern const base::FilePath::CharType
     kTrackerDatabaseFileName[];
 
 class DatabasesTable;
 
 // This class is used to store information about all databases in an origin.
 class WEBKIT_STORAGE_BROWSER_EXPORT OriginInfo {
@@ skipping 41 matching lines @@
     virtual void OnDatabaseScheduledForDeletion(
         const std::string& origin_identifier,
         const base::string16& database_name) = 0;
 
    protected:
     virtual ~Observer() {}
   };
 
   DatabaseTracker(const base::FilePath& profile_path,
                   bool is_incognito,
-                  quota::SpecialStoragePolicy* special_storage_policy,
-                  quota::QuotaManagerProxy* quota_manager_proxy,
+                  storage::SpecialStoragePolicy* special_storage_policy,
+                  storage::QuotaManagerProxy* quota_manager_proxy,
                   base::MessageLoopProxy* db_tracker_thread);
 
   void DatabaseOpened(const std::string& origin_identifier,
                       const base::string16& database_name,
                       const base::string16& database_details,
                       int64 estimated_size,
                       int64* database_size);
   void DatabaseModified(const std::string& origin_identifier,
                         const base::string16& database_name);
   void DatabaseClosed(const std::string& origin_identifier,
@@ skipping 12 matching lines @@
   const base::FilePath& DatabaseDirectory() const { return db_dir_; }
   base::FilePath GetFullDBFilePath(const std::string& origin_identifier,
                                    const base::string16& database_name);
 
   // virtual for unit-testing only
   virtual bool GetOriginInfo(const std::string& origin_id, OriginInfo* info);
   virtual bool GetAllOriginIdentifiers(std::vector<std::string>* origin_ids);
   virtual bool GetAllOriginsInfo(std::vector<OriginInfo>* origins_info);
 
   // Safe to call on any thread.
-  quota::QuotaManagerProxy* quota_manager_proxy() const {
+  storage::QuotaManagerProxy* quota_manager_proxy() const {
     return quota_manager_proxy_.get();
   }
 
   bool IsDatabaseScheduledForDeletion(const std::string& origin_identifier,
                                       const base::string16& database_name);
 
   // Deletes a single database. Returns net::OK on success, net::FAILED on
   // failure, or net::ERR_IO_PENDING and |callback| is invoked upon completion,
   // if non-NULL.
   int DeleteDatabase(const std::string& origin_identifier,
@@ skipping 132 matching lines @@
   scoped_ptr<sql::MetaTable> meta_table_;
   ObserverList<Observer, true> observers_;
   std::map<std::string, CachedOriginInfo> origins_info_map_;
   DatabaseConnections database_connections_;
 
   // The set of databases that should be deleted but are still opened
   DatabaseSet dbs_to_be_deleted_;
   PendingDeletionCallbacks deletion_callbacks_;
 
   // Apps and Extensions can have special rights.
-  scoped_refptr<quota::SpecialStoragePolicy> special_storage_policy_;
+  scoped_refptr<storage::SpecialStoragePolicy> special_storage_policy_;
 
-  scoped_refptr<quota::QuotaManagerProxy> quota_manager_proxy_;
+  scoped_refptr<storage::QuotaManagerProxy> quota_manager_proxy_;
 
   // The database tracker thread we're supposed to run file IO on.
   scoped_refptr<base::MessageLoopProxy> db_tracker_thread_;
 
   // When in incognito mode, store a DELETE_ON_CLOSE handle to each
   // main DB and journal file that was accessed. When the incognito profile
   // goes away (or when the browser crashes), all these handles will be
   // closed, and the files will be deleted.
   FileHandlesMap incognito_file_handles_;
 
   // In a non-incognito profile, all DBs in an origin are stored in a directory
   // named after the origin. In an incognito profile though, we do not want the
   // directory structure to reveal the origins visited by the user (in case the
   // browser process crashes and those directories are not deleted). So we use
   // this map to assign directory names that do not reveal this information.
   OriginDirectoriesMap incognito_origin_directories_;
   int incognito_origin_directories_generator_;
 
   FRIEND_TEST_ALL_PREFIXES(DatabaseTracker, TestHelper);
 };
 
-}  // namespace webkit_database
+}  // namespace storage
 
 #endif  // WEBKIT_BROWSER_DATABASE_DATABASE_TRACKER_H_