Make the renderer-side prerendering code use RenderFrames instead of RenderViews.

chrome/renderer/plugins/chrome_plugin_placeholder.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 "chrome/renderer/plugins/chrome_plugin_placeholder.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/common/prerender_messages.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/renderer/chrome_content_renderer_client.h"
 #include "chrome/renderer/custom_menu_commands.h"
 #include "chrome/renderer/plugins/plugin_uma.h"
 #include "content/public/common/context_menu_params.h"
 #include "content/public/renderer/render_frame.h"
+#include "content/public/renderer/render_frame_observer.h"
 #include "content/public/renderer/render_thread.h"
 #include "content/public/renderer/render_view.h"
 #include "grit/generated_resources.h"
 #include "grit/renderer_resources.h"
 #include "grit/webkit_strings.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 #include "third_party/WebKit/public/web/WebScriptSource.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 14 matching lines @@
 using webkit_glue::CppArgumentList;
 using webkit_glue::CppVariant;
 
 namespace {
 const plugins::PluginPlaceholder* g_last_active_menu = NULL;
 }  // namespace
 
 const char ChromePluginPlaceholder::kPluginPlaceholderDataURL[] =
     "chrome://pluginplaceholderdata/";
 
+class ChromePluginPlaceholder::RenderFrameObserver
+    : public content::RenderFrameObserver {
+ public:
+  explicit RenderFrameObserver(ChromePluginPlaceholder* placeholder)
+      : content::RenderFrameObserver(placeholder->GetRenderFrame()),
+        placeholder_(placeholder) {}
+
+  // content::RenderFrameObserver implementation:
+  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE {
+

[mmenke, 2013/12/10 20:56:41]

nit:  Blank lines at the start of function bodies are frowned upon by a lot of
reviewers.

[jam, 2013/12/10 21:14:17]

Done.

+    // We don't swallow these messages because multiple blocked plugins have an
+    // interest in them.

[mmenke, 2013/12/10 20:56:41]

May want to replace "multiple blocked plugins" with "multiple blocked plugins
and other objects".  The PrerenderHelper and PrerenderMediaLoadDeferrer also
listen for this message.

[jam, 2013/12/10 21:14:17]

I just copied this code, but ok.

+    IPC_BEGIN_MESSAGE_MAP(ChromePluginPlaceholder, message)
+      IPC_MESSAGE_FORWARD(PrerenderMsg_SetIsPrerendering, placeholder_,
+                          ChromePluginPlaceholder::OnSetIsPrerendering)
+    IPC_END_MESSAGE_MAP()
+
+    return false;
+  }
+
+ private:
+  ChromePluginPlaceholder* placeholder_;
+};
+
 ChromePluginPlaceholder::ChromePluginPlaceholder(
     content::RenderView* render_view,
     content::RenderFrame* render_frame,
     blink::WebFrame* frame,
     const blink::WebPluginParams& params,
     const std::string& html_data,
     const base::string16& title)
     : plugins::PluginPlaceholder(render_view,
                                  render_frame,
                                  frame,
                                  params,
                                  html_data,
                                  GURL(kPluginPlaceholderDataURL)),
       status_(new ChromeViewHostMsg_GetPluginInfo_Status),
       title_(title),
 #if defined(ENABLE_PLUGIN_INSTALLATION)
       placeholder_routing_id_(MSG_ROUTING_NONE),
 #endif
       has_host_(false),
       context_menu_request_id_(0) {
   RenderThread::Get()->AddObserver(this);
+
+  frame_observer_.reset(new RenderFrameObserver(this));
 }
 
 ChromePluginPlaceholder::~ChromePluginPlaceholder() {
   RenderThread::Get()->RemoveObserver(this);
   if (context_menu_request_id_)
     render_view()->CancelContextMenu(context_menu_request_id_);
 
 #if defined(ENABLE_PLUGIN_INSTALLATION)
   if (placeholder_routing_id_ == MSG_ROUTING_NONE)
     return;
@@ skipping 125 matching lines @@
   IPC_END_MESSAGE_MAP()
 
   if (handled)
     return true;
 #endif
 
   // We don't swallow these messages because multiple blocked plugins have an
   // interest in them.
   IPC_BEGIN_MESSAGE_MAP(ChromePluginPlaceholder, message)
   IPC_MESSAGE_HANDLER(ChromeViewMsg_LoadBlockedPlugins, OnLoadBlockedPlugins)
-  IPC_MESSAGE_HANDLER(PrerenderMsg_SetIsPrerendering, OnSetIsPrerendering)
   IPC_END_MESSAGE_MAP()
 
   return false;
 }
 
 void ChromePluginPlaceholder::OnLoadBlockedPlugins(
     const std::string& identifier) {
   plugins::PluginPlaceholder::OnLoadBlockedPlugins(identifier);
 }
 
@@ skipping 131 matching lines @@
   context_menu_request_id_ = render_view()->ShowContextMenu(this, params);
   g_last_active_menu = this;
 }
 
 void ChromePluginPlaceholder::BindWebFrame(blink::WebFrame* frame) {
   plugins::PluginPlaceholder::BindWebFrame(frame);
   BindCallback("openAboutPlugins",
                base::Bind(&ChromePluginPlaceholder::OpenAboutPluginsCallback,
                           base::Unretained(this)));
 }