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

content/browser/dom_storage/dom_storage_context_proxy.h

Index: content/browser/dom_storage/dom_storage_context_proxy.h
diff --git a/content/browser/dom_storage/dom_storage_context_impl.h b/content/browser/dom_storage/dom_storage_context_proxy.h
similarity index 70%
copy from content/browser/dom_storage/dom_storage_context_impl.h
copy to content/browser/dom_storage/dom_storage_context_proxy.h
index a418ea37689c2f6892e0256c6a7c5431d3627106..0df4b8791737591852564613d5da86f079f4c695 100644
--- a/content/browser/dom_storage/dom_storage_context_impl.h
+++ b/content/browser/dom_storage/dom_storage_context_proxy.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 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_PROXY_H_
+#define CONTENT_BROWSER_DOM_STORAGE_DOM_STORAGE_CONTEXT_PROXY_H_
 
 #include "base/memory/ref_counted.h"
 #include "content/public/browser/dom_storage_context.h"
@@ -12,8 +12,8 @@ namespace base {
 class FilePath;
 }
 
-namespace dom_storage {
-class DomStorageContext;
+namespace content {
+class DOMStorageContextImpl;

[michaeln, 2013/08/06 22:44:59]

nit: this can go down into the namespace below

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

Done.

 }
 
 namespace quota {
@@ -24,12 +24,12 @@ namespace content {
 
 // This is owned by BrowserContext (aka Profile) and encapsulates all
 // per-profile dom storage state.
-class CONTENT_EXPORT DOMStorageContextImpl :
+class CONTENT_EXPORT DOMStorageContextProxy :

[michaeln, 2013/08/06 22:44:59]

nit: I see why you're using the term 'proxy' here, but it took some looking
since we usually use 'proxy' in the context of ipc interfaces. I wonder if a
less loaded term would be better for this use. "<<>>Wrapper"? Or maybe
"<<>>APIImpl"?

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

Done, renamed to Wrapper.

     NON_EXPORTED_BASE(public DOMStorageContext),
-    public base::RefCountedThreadSafe<DOMStorageContextImpl> {
+    public base::RefCountedThreadSafe<DOMStorageContextProxy> {
  public:
   // If |data_path| is empty, nothing will be saved to disk.
-  DOMStorageContextImpl(const base::FilePath& data_path,
+  DOMStorageContextProxy(const base::FilePath& data_path,
                         quota::SpecialStoragePolicy* special_storage_policy);
 
   // DOMStorageContext implementation.
@@ -39,7 +39,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 +60,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<DOMStorageContextProxy>;
 
-  virtual ~DOMStorageContextImpl();
-  dom_storage::DomStorageContext* context() const { return context_.get(); }
+  virtual ~DOMStorageContextProxy();
+  DOMStorageContextImpl* context() const { return context_.get(); }
 
-  scoped_refptr<dom_storage::DomStorageContext> context_;
+  scoped_refptr<DOMStorageContextImpl> context_;
 
-  DISALLOW_IMPLICIT_CONSTRUCTORS(DOMStorageContextImpl);
+  DISALLOW_IMPLICIT_CONSTRUCTORS(DOMStorageContextProxy);
 };
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_DOM_STORAGE_DOM_STORAGE_CONTEXT_IMPL_H_
+#endif  // CONTENT_BROWSER_DOM_STORAGE_DOM_STORAGE_CONTEXT_PROXY_H_