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

content/browser/dom_storage/dom_storage_session.h

Index: content/browser/dom_storage/dom_storage_session.h
diff --git a/webkit/browser/dom_storage/dom_storage_session.h b/content/browser/dom_storage/dom_storage_session.h
similarity index 49%
rename from webkit/browser/dom_storage/dom_storage_session.h
rename to content/browser/dom_storage/dom_storage_session.h
index b500859e9cf77ec94ec809671686e3f973b2f4fe..c22db7844149c19b5b6560486a73d16a8757f5ac 100644
--- a/webkit/browser/dom_storage/dom_storage_session.h
+++ b/content/browser/dom_storage/dom_storage_session.h
@@ -2,32 +2,32 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_BROWSER_DOM_STORAGE_DOM_STORAGE_SESSION_H_
-#define WEBKIT_BROWSER_DOM_STORAGE_DOM_STORAGE_SESSION_H_
+#ifndef CONTENT_BROWSER_DOM_STORAGE_DOM_STORAGE_SESSION_H_
+#define CONTENT_BROWSER_DOM_STORAGE_DOM_STORAGE_SESSION_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
-#include "webkit/browser/webkit_storage_browser_export.h"
+#include "content/common/content_export.h"
 
-namespace dom_storage {
+namespace content {
 
-class DomStorageContext;
+class DOMStorageContextImpl;
 
 // This refcounted class determines the lifetime of a session
 // storage namespace and provides an interface to Clone() an
 // existing session storage namespace. It may be used on any thread.
-// See class comments for DomStorageContext for a larger overview.
-class WEBKIT_STORAGE_BROWSER_EXPORT DomStorageSession
-    : public base::RefCountedThreadSafe<DomStorageSession> {
+// See class comments for DOMStorageContextImpl for a larger overview.
+class CONTENT_EXPORT DOMStorageSession
+    : public base::RefCountedThreadSafe<DOMStorageSession> {
  public:
-  // Constructs a |DomStorageSession| and allocates new IDs for it.
-  explicit DomStorageSession(DomStorageContext* context);
+  // Constructs a |DOMStorageSession| and allocates new IDs for it.
+  explicit DOMStorageSession(DOMStorageContextImpl* context);
 
-  // Constructs a |DomStorageSession| and assigns |persistent_namespace_id|
+  // Constructs a |DOMStorageSession| and assigns |persistent_namespace_id|
   // to it. Allocates a new non-persistent ID.
-  DomStorageSession(DomStorageContext* context,
+  DOMStorageSession(DOMStorageContextImpl* context,
                     const std::string& persistent_namespace_id);
 
   int64 namespace_id() const { return namespace_id_; }
@@ -36,30 +36,30 @@ class WEBKIT_STORAGE_BROWSER_EXPORT DomStorageSession
   }
   void SetShouldPersist(bool should_persist);
   bool should_persist() const;
-  bool IsFromContext(DomStorageContext* context);
-  DomStorageSession* Clone();
+  bool IsFromContext(DOMStorageContextImpl* context);
+  DOMStorageSession* Clone();
 
-  // Constructs a |DomStorageSession| by cloning
+  // Constructs a |DOMStorageSession| by cloning
   // |namespace_id_to_clone|. Allocates new IDs for it.
-  static DomStorageSession* CloneFrom(DomStorageContext* context,
+  static DOMStorageSession* CloneFrom(DOMStorageContextImpl* context,
                                       int64 namepace_id_to_clone);
 
  private:
-  friend class base::RefCountedThreadSafe<DomStorageSession>;
+  friend class base::RefCountedThreadSafe<DOMStorageSession>;
 
-  DomStorageSession(DomStorageContext* context,
+  DOMStorageSession(DOMStorageContextImpl* context,
                     int64 namespace_id,
                     const std::string& persistent_namespace_id);
-  ~DomStorageSession();
+  ~DOMStorageSession();
 
-  scoped_refptr<DomStorageContext> context_;
+  scoped_refptr<DOMStorageContextImpl> context_;
   int64 namespace_id_;
   std::string persistent_namespace_id_;
   bool should_persist_;
 
-  DISALLOW_IMPLICIT_CONSTRUCTORS(DomStorageSession);
+  DISALLOW_IMPLICIT_CONSTRUCTORS(DOMStorageSession);
 };
 
-}  // namespace dom_storage
+}  // namespace content
 
-#endif  // WEBKIT_BROWSER_DOM_STORAGE_DOM_STORAGE_SESSION_H_
+#endif  // CONTENT_BROWSER_DOM_STORAGE_DOM_STORAGE_SESSION_H_