Get rid of the render view id in localStorage IPCs as it's not used anymore

BUG=none
TEST=none


Review URL: http://codereview.chromium.org/7074022

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87001 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 9 insertions, 23 deletions

diff --git a/content/browser/in_process_webkit/dom_storage_message_filter.cc b/content/browser/in_process_webkit/dom_storage_message_filter.cc
index 93a8828..8a32713 100644
--- a/content/browser/in_process_webkit/dom_storage_message_filter.cc
+++ b/content/browser/in_process_webkit/dom_storage_message_filter.cc
@@ -157,7 +157,7 @@ void DOMStorageMessageFilter::OnGetItem(int64 storage_area_id,
 }
 
 void DOMStorageMessageFilter::OnSetItem(
-    int render_view_id, int64 storage_area_id, const string16& key,
+    int64 storage_area_id, const string16& key,
     const string16& value, const GURL& url,
     WebKit::WebStorageArea::Result* result, NullableString16* old_value) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::WEBKIT));
diff --git a/content/browser/in_process_webkit/dom_storage_message_filter.h b/content/browser/in_process_webkit/dom_storage_message_filter.h
index 3976d7c..9ac9034 100644
--- a/content/browser/in_process_webkit/dom_storage_message_filter.h
+++ b/content/browser/in_process_webkit/dom_storage_message_filter.h
@@ -51,7 +51,7 @@ class DOMStorageMessageFilter : public BrowserMessageFilter {
   void OnKey(int64 storage_area_id, unsigned index, NullableString16* key);
   void OnGetItem(int64 storage_area_id, const string16& key,
                  NullableString16* value);
-  void OnSetItem(int render_view_id, int64 storage_area_id, const string16& key,
+  void OnSetItem(int64 storage_area_id, const string16& key,
                  const string16& value, const GURL& url,
                  WebKit::WebStorageArea::Result* result,
                  NullableString16* old_value);
diff --git a/content/common/dom_storage_messages.h b/content/common/dom_storage_messages.h
index 77169ce..165e96b 100644
--- a/content/common/dom_storage_messages.h
+++ b/content/common/dom_storage_messages.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -68,8 +68,7 @@ IPC_SYNC_MESSAGE_CONTROL2_1(DOMStorageHostMsg_GetItem,
                             NullableString16 /* value */)
 
 // Set a value that's associated with a key in a storage area.
-IPC_SYNC_MESSAGE_CONTROL5_2(DOMStorageHostMsg_SetItem,
-                            int /* routing_id */,
+IPC_SYNC_MESSAGE_CONTROL4_2(DOMStorageHostMsg_SetItem,
                             int64 /* storage_area_id */,
                             string16 /* key */,
                             string16 /* value */,
diff --git a/content/renderer/renderer_webstoragearea_impl.cc b/content/renderer/renderer_webstoragearea_impl.cc
index 6246d4f..4e6f2cf 100644
--- a/content/renderer/renderer_webstoragearea_impl.cc
+++ b/content/renderer/renderer_webstoragearea_impl.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -7,14 +7,10 @@
 #include "content/common/dom_storage_messages.h"
 #include "content/renderer/render_thread.h"
 #include "content/renderer/render_view.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 
-using WebKit::WebFrame;
 using WebKit::WebString;
 using WebKit::WebURL;
-using WebKit::WebView;
 
 RendererWebStorageAreaImpl::RendererWebStorageAreaImpl(
     int64 namespace_id, const WebString& origin) {
@@ -49,19 +45,10 @@ WebString RendererWebStorageAreaImpl::getItem(const WebString& key) {
 
 void RendererWebStorageAreaImpl::setItem(
     const WebString& key, const WebString& value, const WebURL& url,
-    WebStorageArea::Result& result, WebString& old_value_webkit,
-    WebFrame* web_frame) {
-  int32 render_view_id = MSG_ROUTING_CONTROL;
-  if (web_frame) {
-    RenderView* render_view = RenderView::FromWebView(web_frame->view());
-    if (render_view)
-      render_view_id = render_view->routing_id();
-  }
-  DCHECK(render_view_id != MSG_ROUTING_CONTROL);
-
+    WebStorageArea::Result& result, WebString& old_value_webkit) {
   NullableString16 old_value;
   RenderThread::current()->Send(new DOMStorageHostMsg_SetItem(
-      render_view_id, storage_area_id_, key, value, url, &result, &old_value));
+      storage_area_id_, key, value, url, &result, &old_value));
   old_value_webkit = old_value;
 }
 
diff --git a/content/renderer/renderer_webstoragearea_impl.h b/content/renderer/renderer_webstoragearea_impl.h
index dba539e..62746e3 100644
--- a/content/renderer/renderer_webstoragearea_impl.h
+++ b/content/renderer/renderer_webstoragearea_impl.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -23,7 +23,7 @@ class RendererWebStorageAreaImpl : public WebKit::WebStorageArea {
   virtual void setItem(
       const WebKit::WebString& key, const WebKit::WebString& value,
       const WebKit::WebURL& url, WebStorageArea::Result& result,
-      WebKit::WebString& old_value, WebKit::WebFrame* web_view);
+      WebKit::WebString& old_value);
   virtual void removeItem(
       const WebKit::WebString& key, const WebKit::WebURL& url,
       WebKit::WebString& old_value);