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

content/public/browser/dom_storage_context.h

Index: content/public/browser/dom_storage_context.h
diff --git a/content/public/browser/dom_storage_context.h b/content/public/browser/dom_storage_context.h
index d0c502f9fe01bab8a98aa16247d8039b75e28422..3c82f1a38af93468d1d8a721728e611a387980fd 100644
--- a/content/public/browser/dom_storage_context.h
+++ b/content/public/browser/dom_storage_context.h
@@ -9,29 +9,26 @@
 #include <vector>
 
 #include "base/callback.h"
+#include "base/time/time.h"
 #include "content/common/content_export.h"
-
-class GURL;
-
-namespace dom_storage {
-struct LocalStorageUsageInfo;
-struct SessionStorageUsageInfo;
-}
+#include "url/gurl.h"
 
 namespace content {
 
 class BrowserContext;
+struct LocalStorageUsageInfo;
 class SessionStorageNamespace;
+struct SessionStorageUsageInfo;
 
 // Represents the per-BrowserContext Local Storage data.
 class DOMStorageContext {
  public:
   typedef base::Callback<
-      void(const std::vector<dom_storage::LocalStorageUsageInfo>&)>
+      void(const std::vector<LocalStorageUsageInfo>&)>
           GetLocalStorageUsageCallback;
 
   typedef base::Callback<
-      void(const std::vector<dom_storage::SessionStorageUsageInfo>&)>
+      void(const std::vector<SessionStorageUsageInfo>&)>
           GetSessionStorageUsageCallback;
 
   // Returns a collection of origins using local storage to the given callback.
@@ -48,11 +45,11 @@ class DOMStorageContext {
 
   // Deletes the session storage data identified by |usage_info|.
   virtual void DeleteSessionStorage(
-      const dom_storage::SessionStorageUsageInfo& usage_info) = 0;
+      const SessionStorageUsageInfo& usage_info) = 0;
 
   // If this is called, sessionStorage data will be stored on disk, and can be
   // restored after a browser restart (with RecreateSessionStorage). This
-  // function must be called right after DOMStorageContextImpl is created, and
+  // function must be called right after DOMStorageContextProxy is created, and
   // before it's used.
   virtual void SetSaveSessionStorageOnDisk() = 0;
 
@@ -72,6 +69,25 @@ class DOMStorageContext {
   virtual ~DOMStorageContext() {}
 };
 
+// Used to report Local Storage usage info by DOMStorageContext.
+struct CONTENT_EXPORT LocalStorageUsageInfo {

[jam, 2013/08/06 16:13:49]

per content api conventions
(http://www.chromium.org/developers/content-module/content-api), each
struct/class/enum needs to be in its own file.

so please put LocalStorageUsageInfo and SessionStorageUsageInfo each in their
own own header and cc file.

For SessionStorageUsageInfo do you need a constructor or destructor? it doesn't
look like clang will complain if you don't. in general we avoid adding a .cc
file uneess we have to for clang.

[kinuko, 2013/08/07 14:29:52]

Done.

+  GURL origin;
+  size_t data_size;
+  base::Time last_modified;
+
+  LocalStorageUsageInfo();
+  ~LocalStorageUsageInfo();
+};
+
+// Used to report Session Storage usage info by DOMStorageContext.
+struct CONTENT_EXPORT SessionStorageUsageInfo {
+  GURL origin;
+  std::string persistent_namespace_id;
+
+  SessionStorageUsageInfo();
+  ~SessionStorageUsageInfo();
+};
+
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_DOM_STORAGE_CONTEXT_H_