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

content/browser/dom_storage/dom_storage_context_impl.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 CONTENT_BROWSER_DOM_STORAGE_DOM_STORAGE_CONTEXT_IMPL_H_
 #define CONTENT_BROWSER_DOM_STORAGE_DOM_STORAGE_CONTEXT_IMPL_H_
 
 #include <map>
 #include <set>
 #include <vector>
 
 #include "base/atomic_sequence_num.h"
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/observer_list.h"
 #include "base/time/time.h"
 #include "content/browser/dom_storage/dom_storage_namespace.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/session_storage_namespace.h"
 #include "url/gurl.h"
 
 namespace base {
 class FilePath;
 class NullableString16;
 class Time;
 }
 
-namespace quota {
+namespace storage {
 class SpecialStoragePolicy;
 }
 
 namespace content {
 
 class DOMStorageArea;
 class DOMStorageSession;
 class DOMStorageTaskRunner;
 class SessionStorageDatabase;
 struct LocalStorageUsageInfo;
@@ skipping 43 matching lines @@
     // Indicates that cached values of the DOM Storage provided must be
     // cleared and retrieved again.
     virtual void OnDOMSessionStorageReset(int64 namespace_id) = 0;
 
    protected:
     virtual ~EventObserver() {}
   };
 
   // |localstorage_directory| and |sessionstorage_directory| may be empty
   // for incognito browser contexts.
-  DOMStorageContextImpl(
-      const base::FilePath& localstorage_directory,
-      const base::FilePath& sessionstorage_directory,
-      quota::SpecialStoragePolicy* special_storage_policy,
-      DOMStorageTaskRunner* task_runner);
+  DOMStorageContextImpl(const base::FilePath& localstorage_directory,
+                        const base::FilePath& sessionstorage_directory,
+                        storage::SpecialStoragePolicy* special_storage_policy,
+                        DOMStorageTaskRunner* task_runner);
 
   // Returns the directory path for localStorage, or an empty directory, if
   // there is no backing on disk.
   const base::FilePath& localstorage_directory() {
     return localstorage_directory_;
   }
 
   // Returns the directory path for sessionStorage, or an empty directory, if
   // there is no backing on disk.
   const base::FilePath& sessionstorage_directory() {
@@ skipping 115 matching lines @@
 
   // List of objects observing local storage events.
   ObserverList<EventObserver> event_observers_;
 
   // We use a 32 bit identifier for per tab storage sessions.
   // At a tab per second, this range is large enough for 68 years.
   base::AtomicSequenceNumber session_id_sequence_;
 
   bool is_shutdown_;
   bool force_keep_session_state_;
-  scoped_refptr<quota::SpecialStoragePolicy> special_storage_policy_;
+  scoped_refptr<storage::SpecialStoragePolicy> special_storage_policy_;
   scoped_refptr<SessionStorageDatabase> session_storage_database_;
 
   // For cleaning up unused namespaces gradually.
   bool scavenging_started_;
   std::vector<std::string> deletable_persistent_namespace_ids_;
 
   // Persistent namespace IDs to protect from gradual deletion (they will
   // be needed for session restore).
   std::set<std::string> protected_persistent_session_ids_;
 
   // Mapping between persistent namespace IDs and namespace IDs for
   // sessionStorage.
   std::map<std::string, int64> persistent_namespace_id_to_namespace_id_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_DOM_STORAGE_DOM_STORAGE_CONTEXT_IMPL_H_