Chrome side to allow WebKit layer to use WebPermissionClient to check if access to local storage ...

content/browser/in_process_webkit/dom_storage_message_filter.cc

 // 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.
 
 #include "content/browser/in_process_webkit/dom_storage_message_filter.h"
 
 #include "base/nullable_string16.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/in_process_webkit/dom_storage_area.h"
 #include "content/browser/in_process_webkit/dom_storage_context.h"
 #include "content/browser/in_process_webkit/dom_storage_namespace.h"
-#include "content/browser/renderer_host/render_view_host_notification_task.h"
 #include "content/common/dom_storage_messages.h"
 #include "googleurl/src/gurl.h"
 
 using WebKit::WebStorageArea;
 
 DOMStorageMessageFilter* DOMStorageMessageFilter::storage_event_message_filter =
     NULL;
 const GURL* DOMStorageMessageFilter::storage_event_url_ = NULL;
 
 DOMStorageMessageFilter::
@@ skipping 11 matching lines @@
 DOMStorageMessageFilter::
 ScopedStorageEventContext::~ScopedStorageEventContext() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::WEBKIT));
   DCHECK(storage_event_message_filter);
   DCHECK(storage_event_url_);
   storage_event_message_filter = NULL;
   storage_event_url_ = NULL;
 }
 
 DOMStorageMessageFilter::DOMStorageMessageFilter(
-    int process_id, WebKitContext* webkit_context,
-    HostContentSettingsMap* host_content_settings_map)
+    int process_id, WebKitContext* webkit_context)
     : webkit_context_(webkit_context),
-      process_id_(process_id),
-      host_content_settings_map_(host_content_settings_map) {
+      process_id_(process_id) {
 }
 
 DOMStorageMessageFilter::~DOMStorageMessageFilter() {
   // This is not always true during testing.
   if (peer_handle())
     Context()->UnregisterMessageFilter(this);
 }
 
 void DOMStorageMessageFilter::OnChannelConnected(int32 peer_pid) {
   BrowserMessageFilter::OnChannelConnected(peer_pid);
@@ skipping 55 matching lines @@
                                               const string16& origin,
                                               int64* storage_area_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::WEBKIT));
 
   DOMStorageNamespace* storage_namespace =
       Context()->GetStorageNamespace(namespace_id, true);
   if (!storage_namespace) {
     *storage_area_id = DOMStorageContext::kInvalidStorageId;
     return;
   }
-  DOMStorageArea* storage_area = storage_namespace->GetStorageArea(
-      origin, host_content_settings_map_);
+  DOMStorageArea* storage_area = storage_namespace->GetStorageArea(origin);
   *storage_area_id = storage_area->id();
 }
 
 void DOMStorageMessageFilter::OnLength(int64 storage_area_id,
                                        unsigned* length) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::WEBKIT));
   DOMStorageArea* storage_area = Context()->GetStorageArea(storage_area_id);
   if (!storage_area) {
     *length = 0;
   } else {
@@ skipping 31 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::WEBKIT));
   DOMStorageArea* storage_area = Context()->GetStorageArea(storage_area_id);
   if (!storage_area) {
     *old_value = NullableString16(true);
     *result = WebKit::WebStorageArea::ResultOK;
     return;
   }
 
   ScopedStorageEventContext scope(this, &url);
   *old_value = storage_area->SetItem(key, value, result);
-
-  // If content was blocked, tell the UI to display the blocked content icon.
-  if (render_view_id == MSG_ROUTING_CONTROL) {
-    DLOG(WARNING) << "setItem was not given a proper routing id";
-  } else {
-    CallRenderViewHostContentSettingsDelegate(
-        process_id_, render_view_id,
-        &RenderViewHostDelegate::ContentSettings::OnLocalStorageAccessed,
-        url, storage_area->owner()->dom_storage_type(),
-        *result == WebStorageArea::ResultBlockedByPolicy);
-  }
 }
 
 void DOMStorageMessageFilter::OnRemoveItem(
     int64 storage_area_id, const string16& key, const GURL& url,
     NullableString16* old_value) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::WEBKIT));
   DOMStorageArea* storage_area = Context()->GetStorageArea(storage_area_id);
   if (!storage_area) {
     *old_value = NullableString16(true);
     return;
@@ skipping 22 matching lines @@
   const DOMStorageContext::MessageFilterSet* set =
       Context()->GetMessageFilterSet();
   DOMStorageContext::MessageFilterSet::const_iterator cur = set->begin();
   while (cur != set->end()) {
     // The renderer that generates the event handles it itself.
     if (*cur != this)
       (*cur)->Send(new DOMStorageMsg_Event(params));
     ++cur;
   }
 }