Switch ContentSettingsObserver to be a RenderFrameObserver instead of a RenderViewObserver

chrome/browser/prerender/prerender_contents.cc

 // Copyright (c) 2012 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/browser/prerender/prerender_contents.h"
 
 #include <algorithm>
 #include <functional>
 #include <utility>
 
@@ skipping 145 matching lines @@
 
 PrerenderContents::PendingPrerenderInfo::~PendingPrerenderInfo() {
 }
 
 void PrerenderContents::AddPendingPrerender(
     scoped_ptr<PendingPrerenderInfo> pending_prerender_info) {
   pending_prerenders_.push_back(pending_prerender_info.release());
 }
 
 void PrerenderContents::PrepareForUse() {
-  for (std::set<content::RenderFrameHost*>::iterator i =
-           render_frame_hosts_.begin(); i != render_frame_hosts_.end(); ++i) {
-    (*i)->Send(new PrerenderMsg_SetIsPrerendering((*i)->GetRoutingID(), false));
+  if (prerender_contents_.get()) {
+    prerender_contents_->SendToAllFrames(
+        new PrerenderMsg_SetIsPrerendering(MSG_ROUTING_NONE, false));
   }
-  render_frame_hosts_.clear();
 
   NotifyPrerenderStop();
 
   SessionStorageNamespace* session_storage_namespace = NULL;
   if (prerender_contents_) {
     // TODO(ajwong): This does not correctly handle storage for isolated apps.
     session_storage_namespace = prerender_contents_->
         GetController().GetDefaultSessionStorageNamespace();
   }
   prerender_manager_->StartPendingPrerenders(
@@ skipping 359 matching lines @@
   return std::count_if(alias_urls_.begin(), alias_urls_.end(),
                        std::bind2nd(std::equal_to<GURL>(), url)) != 0;
 }
 
 void PrerenderContents::RenderProcessGone(base::TerminationStatus status) {
   Destroy(FINAL_STATUS_RENDERER_CRASHED);
 }
 
 void PrerenderContents::RenderFrameCreated(
     content::RenderFrameHost* render_frame_host) {
-  render_frame_hosts_.insert(render_frame_host);
   // When a new RenderFrame is created for a prerendering WebContents, tell the
   // new RenderFrame it's being used for prerendering before any navigations
   // occur.  Note that this is always triggered before the first navigation, so
   // there's no need to send the message just after the WebContents is created.
   render_frame_host->Send(new PrerenderMsg_SetIsPrerendering(
       render_frame_host->GetRoutingID(), true));
 }
 
-void PrerenderContents::RenderFrameDeleted(
-    content::RenderFrameHost* render_frame_host) {
-  render_frame_hosts_.erase(render_frame_host);
-}
-
 void PrerenderContents::DidStopLoading(
     content::RenderViewHost* render_view_host) {
   has_stopped_loading_ = true;
   NotifyPrerenderStopLoading();
 }
 
 void PrerenderContents::DidStartProvisionalLoadForFrame(
     int64 frame_id,
     int64 parent_frame_id,
     bool is_main_frame,
@@ skipping 187 matching lines @@
     return NULL;
   return prerender_contents()->GetController().
       GetDefaultSessionStorageNamespace();
 }
 
 void PrerenderContents::OnCancelPrerenderForPrinting() {
   Destroy(FINAL_STATUS_WINDOW_PRINT);
 }
 
 }  // namespace prerender