Move webkit/{browser,common}/dom_storage into content/

content/common/dom_storage/dom_storage_types.h

Index: content/common/dom_storage/dom_storage_types.h
diff --git a/webkit/common/dom_storage/dom_storage_types.h b/content/common/dom_storage/dom_storage_types.h
similarity index 50%
rename from webkit/common/dom_storage/dom_storage_types.h
rename to content/common/dom_storage/dom_storage_types.h
index 1d1e585cc41c377ab03d9ea9d898461d2c00ee20..43856620c785dcf945295a540f0d314fa1652317 100644
--- a/webkit/common/dom_storage/dom_storage_types.h
+++ b/content/common/dom_storage/dom_storage_types.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_COMMON_DOM_STORAGE_DOM_STORAGE_TYPES_H_
-#define WEBKIT_COMMON_DOM_STORAGE_DOM_STORAGE_TYPES_H_
+#ifndef CONTENT_COMMON_DOM_STORAGE_DOM_STORAGE_TYPES_H_
+#define CONTENT_COMMON_DOM_STORAGE_DOM_STORAGE_TYPES_H_
 
 #include <map>
 
@@ -12,19 +12,20 @@
 #include "base/strings/string16.h"
 #include "base/time/time.h"
 #include "url/gurl.h"
-#include "webkit/common/webkit_storage_common_export.h"
 
-namespace dom_storage {
+namespace content {
+
+typedef std::map<base::string16, base::NullableString16> DOMStorageValuesMap;
 
 // The quota for each storage area.
 // This value is enforced in renderer processes and the browser process.
-const size_t kPerAreaQuota = 10 * 1024 * 1024;
+const size_t kPerStorageAreaQuota = 10 * 1024 * 1024;
 
 // In the browser process we allow some overage to
 // accomodate concurrent writes from different renderers
 // that were allowed because the limit imposed in the renderer
 // wasn't exceeded.
-const size_t kPerAreaOverQuotaAllowance = 100 * 1024;
+const size_t kPerStorageAreaOverQuotaAllowance = 100 * 1024;
 
 // Value to indicate the localstorage namespace vs non-zero
 // values for sessionstorage namespaces.
@@ -33,30 +34,8 @@ const int64 kLocalStorageNamespaceId = 0;
 const int64 kInvalidSessionStorageNamespaceId = kLocalStorageNamespaceId;
 
 // Start purging memory if the number of in-memory areas exceeds this.
-const int64 kMaxInMemoryAreas = 100;
-
-// Value to indicate an area that not be opened.
-const int kInvalidAreaId = -1;
-
-typedef std::map<base::string16, base::NullableString16> ValuesMap;
-
-struct WEBKIT_STORAGE_COMMON_EXPORT LocalStorageUsageInfo {
-  GURL origin;
-  size_t data_size;
-  base::Time last_modified;
-
-  LocalStorageUsageInfo();
-  ~LocalStorageUsageInfo();
-};
-
-struct WEBKIT_STORAGE_COMMON_EXPORT SessionStorageUsageInfo {
-  GURL origin;
-  std::string persistent_namespace_id;
-
-  SessionStorageUsageInfo();
-  ~SessionStorageUsageInfo();
-};
+const int64 kMaxInMemoryStorageAreas = 100;
 
-}  // namespace dom_storage
+}  // namespace content
 
-#endif  // WEBKIT_COMMON_DOM_STORAGE_DOM_STORAGE_TYPES_H_
+#endif  // CONTENT_COMMON_DOM_STORAGE_DOM_STORAGE_TYPES_H_