Switch ContentSettingsObserver to be a RenderFrameObserver instead of a RenderViewObserver

content/browser/frame_host/interstitial_page_impl.cc

 // Copyright 2013 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/frame_host/interstitial_page_impl.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
@@ skipping 347 matching lines @@
 
 void InterstitialPageImpl::NavigationEntryCommitted(
     const LoadCommittedDetails& load_details) {
   OnNavigatingAwayOrTabClosing();
 }
 
 void InterstitialPageImpl::WebContentsDestroyed(WebContents* web_contents) {
   OnNavigatingAwayOrTabClosing();
 }
 
+void InterstitialPageImpl::RenderFrameCreated(
+    RenderFrameHost* render_frame_host) {
+  // Note this is only for subframes in the interstitial, the notification for
+  // the main frame happens in RenderViewCreated.
+  controller_->delegate()->RenderFrameForInterstitialPageCreated(
+      render_frame_host);
+}
+
 RenderViewHostDelegateView* InterstitialPageImpl::GetDelegateView() {
   return rvh_delegate_view_.get();
 }
 
 const GURL& InterstitialPageImpl::GetURL() const {
   return url_;
 }
 
 void InterstitialPageImpl::RenderViewTerminated(
     RenderViewHost* render_view_host,
@@ skipping 165 matching lines @@
   RenderWidgetHostView* view =
       web_contents_view_port->CreateViewForWidget(render_view_host_);
   render_view_host_->SetView(view);
   render_view_host_->AllowBindings(BINDINGS_POLICY_DOM_AUTOMATION);
 
   int32 max_page_id = web_contents()->
       GetMaxPageIDForSiteInstance(render_view_host_->GetSiteInstance());
   render_view_host_->CreateRenderView(base::string16(),
                                       MSG_ROUTING_NONE,
                                       max_page_id);
-  controller_->delegate()->RenderViewForInterstitialPageCreated(
-      render_view_host_);
+  controller_->delegate()->RenderFrameForInterstitialPageCreated(
+      frame_tree_.root()->render_frame_host());
   view->SetSize(web_contents_view->GetContainerSize());
   // Don't show the interstitial until we have navigated to it.
   view->Hide();
   return web_contents_view;
 }
 
 void InterstitialPageImpl::Proceed() {
   // Don't repeat this if we are already shutting down.  We cannot check for
   // enabled() here, because we may have called Disable without calling Hide.
   if (!render_view_host_)
@@ skipping 282 matching lines @@
 
   web_contents->GetDelegateView()->TakeFocus(reverse);
 }
 
 void InterstitialPageImpl::InterstitialPageRVHDelegateView::OnFindReply(
     int request_id, int number_of_matches, const gfx::Rect& selection_rect,
     int active_match_ordinal, bool final_update) {
 }
 
 }  // namespace content