Make DOMStorageDispatcherHost be a message filter (and rename it accordingly)...

chrome/renderer/renderer_webstoragearea_impl.cc

Index: chrome/renderer/renderer_webstoragearea_impl.cc
===================================================================
--- chrome/renderer/renderer_webstoragearea_impl.cc	(revision 69012)
+++ chrome/renderer/renderer_webstoragearea_impl.cc	(working copy)
@@ -4,7 +4,7 @@
 
 #include "chrome/renderer/renderer_webstoragearea_impl.h"
 
-#include "chrome/common/render_messages.h"
+#include "chrome/common/dom_storage_messages.h"
 #include "chrome/renderer/render_thread.h"
 #include "chrome/renderer/render_view.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
@@ -19,8 +19,8 @@
 RendererWebStorageAreaImpl::RendererWebStorageAreaImpl(
     int64 namespace_id, const WebString& origin) {
   RenderThread::current()->Send(
-      new ViewHostMsg_DOMStorageStorageAreaId(namespace_id, origin,
-                                              &storage_area_id_));
+      new DOMStorageHostMsg_StorageAreaId(namespace_id, origin,
+                                          &storage_area_id_));
 }
 
 RendererWebStorageAreaImpl::~RendererWebStorageAreaImpl() {
@@ -29,21 +29,21 @@
 unsigned RendererWebStorageAreaImpl::length() {
   unsigned length;
   RenderThread::current()->Send(
-      new ViewHostMsg_DOMStorageLength(storage_area_id_, &length));
+      new DOMStorageHostMsg_Length(storage_area_id_, &length));
   return length;
 }
 
 WebString RendererWebStorageAreaImpl::key(unsigned index) {
   NullableString16 key;
   RenderThread::current()->Send(
-      new ViewHostMsg_DOMStorageKey(storage_area_id_, index, &key));
+      new DOMStorageHostMsg_Key(storage_area_id_, index, &key));
   return key;
 }
 
 WebString RendererWebStorageAreaImpl::getItem(const WebString& key) {
   NullableString16 value;
   RenderThread::current()->Send(
-      new ViewHostMsg_DOMStorageGetItem(storage_area_id_, key, &value));
+      new DOMStorageHostMsg_GetItem(storage_area_id_, key, &value));
   return value;
 }
 
@@ -51,18 +51,18 @@
     const WebString& key, const WebString& value, const WebURL& url,
     WebStorageArea::Result& result, WebString& old_value_webkit,
     WebFrame* web_frame) {
-  int32 routing_id = MSG_ROUTING_CONTROL;
+  int32 render_view_id = MSG_ROUTING_CONTROL;
   if (web_frame) {
     RenderView* render_view = RenderView::FromWebView(web_frame->view());
     if (render_view)
-      routing_id = render_view->routing_id();
+      render_view_id = render_view->routing_id();
   }
-  DCHECK(routing_id != MSG_ROUTING_CONTROL);
+  DCHECK(render_view_id != MSG_ROUTING_CONTROL);
 
   NullableString16 old_value;
   IPC::SyncMessage* message =
-      new ViewHostMsg_DOMStorageSetItem(routing_id, storage_area_id_, key,
-                                        value, url, &result, &old_value);
+      new DOMStorageHostMsg_SetItem(render_view_id, storage_area_id_, key,
+                                    value, url, &result, &old_value);
   // NOTE: This may pump events (see RenderThread::Send).
   RenderThread::current()->Send(message);
   old_value_webkit = old_value;
@@ -72,14 +72,12 @@
     const WebString& key, const WebURL& url, WebString& old_value_webkit) {
   NullableString16 old_value;
   RenderThread::current()->Send(
-      new ViewHostMsg_DOMStorageRemoveItem(storage_area_id_, key,
-                                           url, &old_value));
+      new DOMStorageHostMsg_RemoveItem(storage_area_id_, key, url, &old_value));
   old_value_webkit = old_value;
 }
 
 void RendererWebStorageAreaImpl::clear(
     const WebURL& url, bool& cleared_something) {
   RenderThread::current()->Send(
-      new ViewHostMsg_DOMStorageClear(storage_area_id_, url,
-                                      &cleared_something));
+      new DOMStorageHostMsg_Clear(storage_area_id_, url, &cleared_something));
 }