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

content/browser/dom_storage/dom_storage_message_filter.cc

Index: content/browser/dom_storage/dom_storage_message_filter.cc
diff --git a/content/browser/dom_storage/dom_storage_message_filter.cc b/content/browser/dom_storage/dom_storage_message_filter.cc
index 8649ebe46e9819accd5b92b8dd1ceb39a0fd0bbe..52aabe11018816f081e87b4f11f83548b9f0fb37 100644
--- a/content/browser/dom_storage/dom_storage_message_filter.cc
+++ b/content/browser/dom_storage/dom_storage_message_filter.cc
@@ -9,19 +9,20 @@
 #include "base/strings/nullable_string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/sequenced_worker_pool.h"
-#include "content/browser/dom_storage/dom_storage_context_impl.h"
-#include "content/common/dom_storage_messages.h"
+#include "content/browser/dom_storage/dom_storage_area.h"
+#include "content/browser/dom_storage/dom_storage_context_wrapper.h"
+#include "content/browser/dom_storage/dom_storage_host.h"
+#include "content/browser/dom_storage/dom_storage_namespace.h"
+#include "content/browser/dom_storage/dom_storage_task_runner.h"
+#include "content/common/dom_storage/dom_storage_messages.h"
 #include "content/public/browser/user_metrics.h"
 #include "url/gurl.h"
-#include "webkit/browser/dom_storage/dom_storage_area.h"
-#include "webkit/browser/dom_storage/dom_storage_host.h"
-#include "webkit/browser/dom_storage/dom_storage_task_runner.h"
 
 namespace content {
 
 DOMStorageMessageFilter::DOMStorageMessageFilter(
     int unused,
-    DOMStorageContextImpl* context)
+    DOMStorageContextWrapper* context)
     : context_(context->context()),
       connection_dispatching_message_for_(0) {
 }
@@ -32,7 +33,7 @@ DOMStorageMessageFilter::~DOMStorageMessageFilter() {
 
 void DOMStorageMessageFilter::InitializeInSequence() {
   DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::IO));
-  host_.reset(new dom_storage::DomStorageHost(context_.get()));
+  host_.reset(new DOMStorageHost(context_.get()));
   context_->AddEventObserver(this);
 }
 
@@ -49,7 +50,7 @@ void DOMStorageMessageFilter::OnFilterAdded(IPC::Channel* channel) {
   BrowserMessageFilter::OnFilterAdded(channel);
   context_->task_runner()->PostShutdownBlockingTask(
       FROM_HERE,
-      dom_storage::DomStorageTaskRunner::PRIMARY_SEQUENCE,
+      DOMStorageTaskRunner::PRIMARY_SEQUENCE,
       base::Bind(&DOMStorageMessageFilter::InitializeInSequence, this));
 }
 
@@ -58,7 +59,7 @@ void DOMStorageMessageFilter::OnFilterRemoved() {
   BrowserMessageFilter::OnFilterRemoved();
   context_->task_runner()->PostShutdownBlockingTask(
       FROM_HERE,
-      dom_storage::DomStorageTaskRunner::PRIMARY_SEQUENCE,
+      DOMStorageTaskRunner::PRIMARY_SEQUENCE,
       base::Bind(&DOMStorageMessageFilter::UninitializeInSequence, this));
 }
 
@@ -106,7 +107,7 @@ void DOMStorageMessageFilter::OnCloseStorageArea(int connection_id) {
 }
 
 void DOMStorageMessageFilter::OnLoadStorageArea(int connection_id,
-                                                dom_storage::ValuesMap* map) {
+                                                DOMStorageValuesMap* map) {
   DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::IO));
   if (!host_->ExtractAreaValues(connection_id, map)) {
     RecordAction(UserMetricsAction("BadMessageTerminate_DSMF_2"));
@@ -154,40 +155,40 @@ void DOMStorageMessageFilter::OnFlushMessages() {
   // Intentionally empty method body.
 }
 
-void DOMStorageMessageFilter::OnDomStorageItemSet(
-    const dom_storage::DomStorageArea* area,
+void DOMStorageMessageFilter::OnDOMStorageItemSet(
+    const DOMStorageArea* area,
     const string16& key,
     const string16& new_value,
     const base::NullableString16& old_value,
     const GURL& page_url) {
-  SendDomStorageEvent(area, page_url,
+  SendDOMStorageEvent(area, page_url,
                       base::NullableString16(key, false),
                       base::NullableString16(new_value, false),
                       old_value);
 }
 
-void DOMStorageMessageFilter::OnDomStorageItemRemoved(
-    const dom_storage::DomStorageArea* area,
+void DOMStorageMessageFilter::OnDOMStorageItemRemoved(
+    const DOMStorageArea* area,
     const string16& key,
     const string16& old_value,
     const GURL& page_url) {
-  SendDomStorageEvent(area, page_url,
+  SendDOMStorageEvent(area, page_url,
                       base::NullableString16(key, false),
                       base::NullableString16(),
                       base::NullableString16(old_value, false));
 }
 
-void DOMStorageMessageFilter::OnDomStorageAreaCleared(
-    const dom_storage::DomStorageArea* area,
+void DOMStorageMessageFilter::OnDOMStorageAreaCleared(
+    const DOMStorageArea* area,
     const GURL& page_url) {
-  SendDomStorageEvent(area, page_url,
+  SendDOMStorageEvent(area, page_url,
                       base::NullableString16(),
                       base::NullableString16(),
                       base::NullableString16());
 }
 
-void DOMStorageMessageFilter::SendDomStorageEvent(
-    const dom_storage::DomStorageArea* area,
+void DOMStorageMessageFilter::SendDOMStorageEvent(
+    const DOMStorageArea* area,
     const GURL& page_url,
     const base::NullableString16& key,
     const base::NullableString16& new_value,