Cleanup unused code from r84023 now that WebKit has been rolled.

TBR=tburkard
Review URL: http://codereview.chromium.org/6930003

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

1 files changed, 2 insertions, 17 deletions

diff --git a/content/renderer/renderer_webstoragearea_impl.cc b/content/renderer/renderer_webstoragearea_impl.cc
index 4f9a5c6..6246d4f 100644
--- a/content/renderer/renderer_webstoragearea_impl.cc
+++ b/content/renderer/renderer_webstoragearea_impl.cc
@@ -4,9 +4,6 @@
 
 #include "content/renderer/renderer_webstoragearea_impl.h"
 
-// TODO(jam): temporary include until webkit merge
-#include "chrome/renderer/content_settings_observer.h"
-
 #include "content/common/dom_storage_messages.h"
 #include "content/renderer/render_thread.h"
 #include "content/renderer/render_view.h"
@@ -20,8 +17,7 @@ using WebKit::WebURL;
 using WebKit::WebView;
 
 RendererWebStorageAreaImpl::RendererWebStorageAreaImpl(
-    int64 namespace_id, const WebString& origin, DOMStorageType storage_type)
-    : storage_type_(storage_type) {
+    int64 namespace_id, const WebString& origin) {
   RenderThread::current()->Send(
       new DOMStorageHostMsg_StorageAreaId(namespace_id, origin,
                                           &storage_area_id_));
@@ -58,19 +54,8 @@ void RendererWebStorageAreaImpl::setItem(
   int32 render_view_id = MSG_ROUTING_CONTROL;
   if (web_frame) {
     RenderView* render_view = RenderView::FromWebView(web_frame->view());
-    if (render_view) {
+    if (render_view)
       render_view_id = render_view->routing_id();
-
-      // TODO(jam): remove after merge
-      ContentSettingsObserver* content_setting =
-          ContentSettingsObserver::Get(render_view);
-      if (!content_setting->AllowStorage(
-              web_frame, storage_type_ == DOM_STORAGE_LOCAL)) {
-        result = WebStorageArea::ResultBlockedByQuota;
-        old_value_webkit = NullableString16();
-        return;
-      }
-    }
   }
   DCHECK(render_view_id != MSG_ROUTING_CONTROL);