Switch ContentSettingsObserver to be a RenderFrameObserver instead of a RenderViewObserver

chrome/renderer/chrome_content_renderer_client.cc

Index: chrome/renderer/chrome_content_renderer_client.cc
===================================================================
--- chrome/renderer/chrome_content_renderer_client.cc	(revision 240362)
+++ chrome/renderer/chrome_content_renderer_client.cc	(working copy)
@@ -354,6 +354,14 @@
 void ChromeContentRendererClient::RenderFrameCreated(
     content::RenderFrame* render_frame) {
   new ChromeRenderFrameObserver(render_frame);
+
+  ContentSettingsObserver* content_settings =
+      new ContentSettingsObserver(render_frame, extension_dispatcher_.get());
+  if (chrome_observer_.get()) {
+    content_settings->SetContentSettingRules(
+        chrome_observer_->content_setting_rules());
+  }
+
 #if defined(ENABLE_PLUGINS)
   new PepperHelper(render_frame);
 #endif
@@ -361,12 +369,6 @@
 
 void ChromeContentRendererClient::RenderViewCreated(
     content::RenderView* render_view) {
-  ContentSettingsObserver* content_settings =
-      new ContentSettingsObserver(render_view, extension_dispatcher_.get());
-  if (chrome_observer_.get()) {
-    content_settings->SetContentSettingRules(
-        chrome_observer_->content_setting_rules());
-  }
   new extensions::ExtensionHelper(render_view, extension_dispatcher_.get());
   new PageLoadHistograms(render_view);
 #if defined(ENABLE_PRINTING)
@@ -546,7 +548,7 @@
 
     // TODO(jam): switch ContentSettingsObserver to RenderFrameObserver.
     ContentSettingsObserver* observer =
-        ContentSettingsObserver::Get(render_frame->GetRenderView());
+        ContentSettingsObserver::Get(render_frame);
 
     const ContentSettingsType content_type =
         ShouldUseJavaScriptSettingForPlugin(plugin) ?
@@ -1381,7 +1383,7 @@
 
 blink::WebWorkerPermissionClientProxy*
 ChromeContentRendererClient::CreateWorkerPermissionClientProxy(
-    content::RenderView* render_view,
+    content::RenderFrame* render_frame,
     blink::WebFrame* frame) {
-  return new WorkerPermissionClientProxy(render_view, frame);
+  return new WorkerPermissionClientProxy(render_frame, frame);
 }