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

content/browser/dom_storage/dom_storage_host.h

Index: content/browser/dom_storage/dom_storage_host.h
diff --git a/webkit/browser/dom_storage/dom_storage_host.h b/content/browser/dom_storage/dom_storage_host.h
similarity index 62%
rename from webkit/browser/dom_storage/dom_storage_host.h
rename to content/browser/dom_storage/dom_storage_host.h
index 31e19624ac62f33b5b9ecc0733974fe55ca70be1..37cfeb6f5d4f1ad373980586fb3c5b74d167ec0b 100644
--- a/webkit/browser/dom_storage/dom_storage_host.h
+++ b/content/browser/dom_storage/dom_storage_host.h
@@ -2,40 +2,40 @@
 // 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_HOST_H_
-#define WEBKIT_BROWSER_DOM_STORAGE_DOM_STORAGE_HOST_H_
+#ifndef CONTENT_BROWSER_DOM_STORAGE_DOM_STORAGE_HOST_H_
+#define CONTENT_BROWSER_DOM_STORAGE_DOM_STORAGE_HOST_H_
 
 #include <map>
 
 #include "base/memory/ref_counted.h"
 #include "base/strings/nullable_string16.h"
 #include "base/strings/string16.h"
-#include "webkit/browser/webkit_storage_browser_export.h"
-#include "webkit/common/dom_storage/dom_storage_types.h"
+#include "content/common/content_export.h"
+#include "content/common/dom_storage/dom_storage_types.h"
 
 class GURL;
 
-namespace dom_storage {
+namespace content {
 
-class DomStorageContext;
-class DomStorageHost;
-class DomStorageNamespace;
-class DomStorageArea;
+class DOMStorageContextImpl;
+class DOMStorageHost;
+class DOMStorageNamespace;
+class DOMStorageArea;
 
 // One instance is allocated in the main process for each client process.
-// Used by DomStorageMessageFilter in Chrome and by SimpleDomStorage in DRT.
+// Used by DOMStorageMessageFilter in Chrome and by SimpleDOMStorage in DRT.
 // This class is single threaded, and performs blocking file reads/writes,
 // so it shouldn't be used on chrome's IO thread.
-// See class comments for DomStorageContext for a larger overview.
-class WEBKIT_STORAGE_BROWSER_EXPORT DomStorageHost {
+// See class comments for DOMStorageContextImpl for a larger overview.
+class CONTENT_EXPORT DOMStorageHost {
  public:
-  explicit DomStorageHost(DomStorageContext* context);
-  ~DomStorageHost();
+  explicit DOMStorageHost(DOMStorageContextImpl* context);
+  ~DOMStorageHost();
 
   bool OpenStorageArea(int connection_id, int namespace_id,
                        const GURL& origin);
   void CloseStorageArea(int connection_id);
-  bool ExtractAreaValues(int connection_id, ValuesMap* map);
+  bool ExtractAreaValues(int connection_id, DOMStorageValuesMap* map);
   unsigned GetAreaLength(int connection_id);
   base::NullableString16 GetAreaKey(int connection_id, unsigned index);
   base::NullableString16 GetAreaItem(int connection_id,
@@ -53,20 +53,20 @@ class WEBKIT_STORAGE_BROWSER_EXPORT DomStorageHost {
   // Struct to hold references needed for areas that are open
   // within our associated client process.
   struct NamespaceAndArea {
-    scoped_refptr<DomStorageNamespace> namespace_;
-    scoped_refptr<DomStorageArea> area_;
+    scoped_refptr<DOMStorageNamespace> namespace_;
+    scoped_refptr<DOMStorageArea> area_;
     NamespaceAndArea();
     ~NamespaceAndArea();
   };
   typedef std::map<int, NamespaceAndArea > AreaMap;
 
-  DomStorageArea* GetOpenArea(int connection_id);
-  DomStorageNamespace* GetNamespace(int connection_id);
+  DOMStorageArea* GetOpenArea(int connection_id);
+  DOMStorageNamespace* GetNamespace(int connection_id);
 
-  scoped_refptr<DomStorageContext> context_;
+  scoped_refptr<DOMStorageContextImpl> context_;
   AreaMap connections_;
 };
 
-}  // namespace dom_storage
+}  // namespace content
 
-#endif  // WEBKIT_BROWSER_DOM_STORAGE_DOM_STORAGE_HOST_H_
+#endif  // CONTENT_BROWSER_DOM_STORAGE_DOM_STORAGE_HOST_H_