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

content/browser/dom_storage/dom_storage_session.cc

Index: content/browser/dom_storage/dom_storage_session.cc
diff --git a/webkit/browser/dom_storage/dom_storage_session.cc b/content/browser/dom_storage/dom_storage_session.cc
similarity index 63%
rename from webkit/browser/dom_storage/dom_storage_session.cc
rename to content/browser/dom_storage/dom_storage_session.cc
index 2c33ed39662f074de5c5b04e1bf1bd3ef0851849..ef105caaf676879ae2b288a23ae65fcdfbdefa32 100644
--- a/webkit/browser/dom_storage/dom_storage_session.cc
+++ b/content/browser/dom_storage/dom_storage_session.cc
@@ -2,29 +2,29 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/browser/dom_storage/dom_storage_session.h"
+#include "content/browser/dom_storage/dom_storage_session.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/tracked_objects.h"
-#include "webkit/browser/dom_storage/dom_storage_context.h"
-#include "webkit/browser/dom_storage/dom_storage_task_runner.h"
+#include "content/browser/dom_storage/dom_storage_context_impl.h"
+#include "content/browser/dom_storage/dom_storage_task_runner.h"
 
-namespace dom_storage {
+namespace content {
 
-DomStorageSession::DomStorageSession(DomStorageContext* context)
+DOMStorageSession::DOMStorageSession(DOMStorageContextImpl* context)
     : context_(context),
       namespace_id_(context->AllocateSessionId()),
       persistent_namespace_id_(context->AllocatePersistentSessionId()),
       should_persist_(false) {
   context->task_runner()->PostTask(
       FROM_HERE,
-      base::Bind(&DomStorageContext::CreateSessionNamespace,
+      base::Bind(&DOMStorageContextImpl::CreateSessionNamespace,
                  context_, namespace_id_, persistent_namespace_id_));
 }
 
-DomStorageSession::DomStorageSession(DomStorageContext* context,
+DOMStorageSession::DOMStorageSession(DOMStorageContextImpl* context,
                                      const std::string& persistent_namespace_id)
     : context_(context),
       namespace_id_(context->AllocateSessionId()),
@@ -32,39 +32,39 @@ DomStorageSession::DomStorageSession(DomStorageContext* context,
       should_persist_(false) {
   context->task_runner()->PostTask(
       FROM_HERE,
-      base::Bind(&DomStorageContext::CreateSessionNamespace,
+      base::Bind(&DOMStorageContextImpl::CreateSessionNamespace,
                  context_, namespace_id_, persistent_namespace_id_));
 }
 
-void DomStorageSession::SetShouldPersist(bool should_persist) {
+void DOMStorageSession::SetShouldPersist(bool should_persist) {
   should_persist_ = should_persist;
 }
 
-bool DomStorageSession::should_persist() const {
+bool DOMStorageSession::should_persist() const {
   return should_persist_;
 }
 
-bool DomStorageSession::IsFromContext(DomStorageContext* context) {
+bool DOMStorageSession::IsFromContext(DOMStorageContextImpl* context) {
   return context_.get() == context;
 }
 
-DomStorageSession* DomStorageSession::Clone() {
+DOMStorageSession* DOMStorageSession::Clone() {
   return CloneFrom(context_.get(), namespace_id_);
 }
 
 // static
-DomStorageSession* DomStorageSession::CloneFrom(DomStorageContext* context,
+DOMStorageSession* DOMStorageSession::CloneFrom(DOMStorageContextImpl* context,
                                                 int64 namepace_id_to_clone) {
   int64 clone_id = context->AllocateSessionId();
   std::string persistent_clone_id = context->AllocatePersistentSessionId();
   context->task_runner()->PostTask(
       FROM_HERE,
-      base::Bind(&DomStorageContext::CloneSessionNamespace,
+      base::Bind(&DOMStorageContextImpl::CloneSessionNamespace,
                  context, namepace_id_to_clone, clone_id, persistent_clone_id));
-  return new DomStorageSession(context, clone_id, persistent_clone_id);
+  return new DOMStorageSession(context, clone_id, persistent_clone_id);
 }
 
-DomStorageSession::DomStorageSession(DomStorageContext* context,
+DOMStorageSession::DOMStorageSession(DOMStorageContextImpl* context,
                                      int64 namespace_id,
                                      const std::string& persistent_namespace_id)
     : context_(context),
@@ -74,11 +74,11 @@ DomStorageSession::DomStorageSession(DomStorageContext* context,
   // This ctor is intended for use by the Clone() method.
 }
 
-DomStorageSession::~DomStorageSession() {
+DOMStorageSession::~DOMStorageSession() {
   context_->task_runner()->PostTask(
       FROM_HERE,
-      base::Bind(&DomStorageContext::DeleteSessionNamespace,
+      base::Bind(&DOMStorageContextImpl::DeleteSessionNamespace,
                  context_, namespace_id_, should_persist_));
 }
 
-}  // namespace dom_storage
+}  // namespace content