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

chrome/browser/ui/webui/quota_internals/quota_internals_types.h

Index: chrome/browser/ui/webui/quota_internals/quota_internals_types.h
diff --git a/chrome/browser/ui/webui/quota_internals/quota_internals_types.h b/chrome/browser/ui/webui/quota_internals/quota_internals_types.h
index 0c70a45628cc028ced0a8912b7424c7e8d6f605b..fcc8cf00419776ca602aba6c85e7326cc5fc966f 100644
--- a/chrome/browser/ui/webui/quota_internals/quota_internals_types.h
+++ b/chrome/browser/ui/webui/quota_internals/quota_internals_types.h
@@ -21,7 +21,7 @@ namespace quota_internals {
 // Represends global usage and quota information for specific type of storage.
 class GlobalStorageInfo {
  public:
-  explicit GlobalStorageInfo(quota::StorageType type);
+  explicit GlobalStorageInfo(storage::StorageType type);
   ~GlobalStorageInfo();
 
   void set_usage(int64 usage) {
@@ -40,7 +40,7 @@ class GlobalStorageInfo {
   // deleting the returned pointer.
   base::Value* NewValue() const;
  private:
-  quota::StorageType type_;
+  storage::StorageType type_;
 
   int64 usage_;
   int64 unlimited_usage_;
@@ -50,7 +50,7 @@ class GlobalStorageInfo {
 // Represents per host usage and quota information for the storage.
 class PerHostStorageInfo {
  public:
-  PerHostStorageInfo(const std::string& host, quota::StorageType type);
+  PerHostStorageInfo(const std::string& host, storage::StorageType type);
   ~PerHostStorageInfo();
 
   void set_usage(int64 usage) {
@@ -66,7 +66,7 @@ class PerHostStorageInfo {
   base::Value* NewValue() const;
  private:
   std::string host_;
-  quota::StorageType type_;
+  storage::StorageType type_;
 
   int64 usage_;
   int64 quota_;
@@ -75,7 +75,7 @@ class PerHostStorageInfo {
 // Represendts per origin usage and access time information.
 class PerOriginStorageInfo {
  public:
-  PerOriginStorageInfo(const GURL& origin, quota::StorageType type);
+  PerOriginStorageInfo(const GURL& origin, storage::StorageType type);
   ~PerOriginStorageInfo();
 
   void set_in_use(bool in_use) {
@@ -99,7 +99,7 @@ class PerOriginStorageInfo {
   base::Value* NewValue() const;
  private:
   GURL origin_;
-  quota::StorageType type_;
+  storage::StorageType type_;
   std::string host_;
 
   int in_use_;