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

content/browser/dom_storage/dom_storage_context_wrapper.h

Index: content/browser/dom_storage/dom_storage_context_wrapper.h
diff --git a/content/browser/dom_storage/dom_storage_context_impl.h b/content/browser/dom_storage/dom_storage_context_wrapper.h
similarity index 69%
copy from content/browser/dom_storage/dom_storage_context_impl.h
copy to content/browser/dom_storage/dom_storage_context_wrapper.h
index a418ea37689c2f6892e0256c6a7c5431d3627106..6abed805a1c75f048d8be12afeb02f1c01b99758 100644
--- a/content/browser/dom_storage/dom_storage_context_impl.h
+++ b/content/browser/dom_storage/dom_storage_context_wrapper.h
@@ -2,34 +2,33 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_BROWSER_DOM_STORAGE_DOM_STORAGE_CONTEXT_IMPL_H_
-#define CONTENT_BROWSER_DOM_STORAGE_DOM_STORAGE_CONTEXT_IMPL_H_
+#ifndef CONTENT_BROWSER_DOM_STORAGE_DOM_STORAGE_CONTEXT_WRAPPER_H_
+#define CONTENT_BROWSER_DOM_STORAGE_DOM_STORAGE_CONTEXT_WRAPPER_H_
 
 #include "base/memory/ref_counted.h"
+#include "content/common/content_export.h"
 #include "content/public/browser/dom_storage_context.h"
 
 namespace base {
 class FilePath;
 }
 
-namespace dom_storage {
-class DomStorageContext;
-}
-
 namespace quota {
 class SpecialStoragePolicy;
 }
 
 namespace content {
 
+class DOMStorageContextImpl;
+
 // This is owned by BrowserContext (aka Profile) and encapsulates all
 // per-profile dom storage state.
-class CONTENT_EXPORT DOMStorageContextImpl :
+class CONTENT_EXPORT DOMStorageContextWrapper :
     NON_EXPORTED_BASE(public DOMStorageContext),
-    public base::RefCountedThreadSafe<DOMStorageContextImpl> {
+    public base::RefCountedThreadSafe<DOMStorageContextWrapper> {
  public:
   // If |data_path| is empty, nothing will be saved to disk.
-  DOMStorageContextImpl(const base::FilePath& data_path,
+  DOMStorageContextWrapper(const base::FilePath& data_path,
                         quota::SpecialStoragePolicy* special_storage_policy);
 
   // DOMStorageContext implementation.
@@ -39,7 +38,7 @@ class CONTENT_EXPORT DOMStorageContextImpl :
       const GetSessionStorageUsageCallback& callback) OVERRIDE;
   virtual void DeleteLocalStorage(const GURL& origin) OVERRIDE;
   virtual void DeleteSessionStorage(
-      const dom_storage::SessionStorageUsageInfo& usage_info) OVERRIDE;
+      const SessionStorageUsageInfo& usage_info) OVERRIDE;
   virtual void SetSaveSessionStorageOnDisk() OVERRIDE;
   virtual scoped_refptr<SessionStorageNamespace>
       RecreateSessionStorage(const std::string& persistent_id) OVERRIDE;
@@ -60,16 +59,16 @@ class CONTENT_EXPORT DOMStorageContextImpl :
  private:
   friend class DOMStorageMessageFilter;  // for access to context()
   friend class SessionStorageNamespaceImpl;  // ditto
-  friend class base::RefCountedThreadSafe<DOMStorageContextImpl>;
+  friend class base::RefCountedThreadSafe<DOMStorageContextWrapper>;
 
-  virtual ~DOMStorageContextImpl();
-  dom_storage::DomStorageContext* context() const { return context_.get(); }
+  virtual ~DOMStorageContextWrapper();
+  DOMStorageContextImpl* context() const { return context_.get(); }
 
-  scoped_refptr<dom_storage::DomStorageContext> context_;
+  scoped_refptr<DOMStorageContextImpl> context_;
 
-  DISALLOW_IMPLICIT_CONSTRUCTORS(DOMStorageContextImpl);
+  DISALLOW_IMPLICIT_CONSTRUCTORS(DOMStorageContextWrapper);
 };
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_DOM_STORAGE_DOM_STORAGE_CONTEXT_IMPL_H_
+#endif  // CONTENT_BROWSER_DOM_STORAGE_DOM_STORAGE_CONTEXT_WRAPPER_H_