Move the content settings code out of RenderView, since it belongs in the Chrome layer.

chrome/renderer/chrome_content_renderer_client.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 "chrome/renderer/chrome_content_renderer_client.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/message_loop.h"
@@ skipping 12 matching lines @@
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/renderer/autofill/autofill_agent.h"
 #include "chrome/renderer/autofill/form_manager.h"
 #include "chrome/renderer/autofill/password_autofill_manager.h"
 #include "chrome/renderer/automation/automation_renderer_helper.h"
 #include "chrome/renderer/automation/dom_automation_v8_extension.h"
 #include "chrome/renderer/blocked_plugin.h"
 #include "chrome/renderer/chrome_render_process_observer.h"
 #include "chrome/renderer/chrome_render_view_observer.h"
+#include "chrome/renderer/content_settings_observer.h"
 #include "chrome/renderer/devtools_agent.h"
 #include "chrome/renderer/devtools_agent_filter.h"
 #include "chrome/renderer/extensions/bindings_utils.h"
 #include "chrome/renderer/extensions/event_bindings.h"
 #include "chrome/renderer/extensions/extension_dispatcher.h"
 #include "chrome/renderer/extensions/extension_helper.h"
 #include "chrome/renderer/extensions/extension_process_bindings.h"
 #include "chrome/renderer/extensions/extension_resource_request_policy.h"
 #include "chrome/renderer/extensions/renderer_extension_bindings.h"
 #include "chrome/renderer/external_extension.h"
@@ skipping 231 matching lines @@
 void ChromeContentRendererClient::RenderViewCreated(RenderView* render_view) {
   safe_browsing::PhishingClassifierDelegate* phishing_classifier = NULL;
 #ifndef OS_CHROMEOS
   if (!CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableClientSidePhishingDetection)) {
     phishing_classifier =
         new safe_browsing::PhishingClassifierDelegate(render_view, NULL);
   }
 #endif
 
+  new ContentSettingsObserver(render_view);
   new DevToolsAgent(render_view);
   new ExtensionHelper(render_view, extension_dispatcher_.get());
   new PageLoadHistograms(render_view, histogram_snapshots_.get());
   new PrintWebViewHelper(render_view);
   new SearchBox(render_view);
   new SpellCheckProvider(render_view, spellcheck_.get());
   new safe_browsing::MalwareDOMDetails(render_view);
 
   PasswordAutofillManager* password_autofill_manager =
       new PasswordAutofillManager(render_view);
@@ skipping 80 matching lines @@
       }
       return CreatePluginPlaceholder(
           render_view, frame, params, *group, IDR_BLOCKED_PLUGIN_HTML,
           IDS_PLUGIN_OUTDATED, false,
           outdated_plugins_policy == CONTENT_SETTING_ASK);
     } else {
       DCHECK(outdated_plugins_policy == CONTENT_SETTING_ALLOW);
     }
   }
 
-  ContentSetting host_setting = render_view->current_content_settings_.
-      settings[CONTENT_SETTINGS_TYPE_PLUGINS];
+  ContentSettingsObserver* observer = ContentSettingsObserver::Get(render_view);
+  ContentSetting host_setting =
+      observer->GetContentSetting(CONTENT_SETTINGS_TYPE_PLUGINS);
 
   if (group->RequiresAuthorization() &&
       !cmd->HasSwitch(switches::kAlwaysAuthorizePlugins) &&
       (plugin_setting == CONTENT_SETTING_ALLOW ||
        plugin_setting == CONTENT_SETTING_ASK) &&
       host_setting == CONTENT_SETTING_DEFAULT) {
     render_view->Send(new ViewHostMsg_BlockedOutdatedPlugin(
         render_view->routing_id(), group->GetGroupName(), GURL()));
     return CreatePluginPlaceholder(
         render_view, frame, params, *group, IDR_BLOCKED_PLUGIN_HTML,
@@ skipping 22 matching lines @@
       return NULL;
     }
 
     return render_view->CreateNPAPIPlugin(
         frame, params, info.path, actual_mime_type);
   }
 
   std::string resource;
   if (cmd->HasSwitch(switches::kEnableResourceContentSettings))
     resource = group->identifier();
-  render_view->DidBlockContentType(CONTENT_SETTINGS_TYPE_PLUGINS, resource);
+  observer->DidBlockContentType(CONTENT_SETTINGS_TYPE_PLUGINS, resource);
   if (plugin_setting == CONTENT_SETTING_ASK) {
     return CreatePluginPlaceholder(
         render_view, frame, params, *group, IDR_CLICK_TO_PLAY_PLUGIN_HTML,
         IDS_PLUGIN_LOAD, false, true);
   } else {
     return CreatePluginPlaceholder(
         render_view, frame, params, *group, IDR_BLOCKED_PLUGIN_HTML,
         IDS_PLUGIN_BLOCKED, false, true);
   }
 }
@@ skipping 200 matching lines @@
   if (old_url.is_empty() && frame->opener())
     old_url = frame->opener()->url();
 
   bool old_url_is_hosted_app = extensions->GetByURL(old_url) &&
       !extensions->GetByURL(old_url)->web_extent().is_empty();
   return !extensions->InSameExtent(old_url, new_url) &&
          !old_url_is_hosted_app;
 }
 
 }  // namespace chrome