GuestView: Fix message routing across embedder navigations

content/browser/browser_plugin/browser_plugin_embedder.h

Index: content/browser/browser_plugin/browser_plugin_embedder.h
diff --git a/content/browser/browser_plugin/browser_plugin_embedder.h b/content/browser/browser_plugin/browser_plugin_embedder.h
index b4cade6edf42dd60462e0bd1021e0db4463adadc..921ab15f498c21a2f593540bc33d8980afa6d779 100644
--- a/content/browser/browser_plugin/browser_plugin_embedder.h
+++ b/content/browser/browser_plugin/browser_plugin_embedder.h
@@ -51,6 +51,8 @@ class CONTENT_EXPORT BrowserPluginEmbedder : public WebContentsObserver {
 
   // WebContentsObserver implementation.
   bool OnMessageReceived(const IPC::Message& message) override;
+  bool OnMessageReceived(const IPC::Message& message,
+                         RenderFrameHost* render_frame_host) override;
 
   void DragSourceEndedAt(int client_x, int client_y, int screen_x,
       int screen_y, blink::WebDragOperation operation);
@@ -96,7 +98,8 @@ class CONTENT_EXPORT BrowserPluginEmbedder : public WebContentsObserver {
   static bool StopFindingInGuest(StopFindAction action, WebContents* guest);
 
   // Message handlers.
-  void OnAttach(int instance_id,
+  void OnAttach(RenderFrameHost* render_frame_host,
+                int instance_id,
                 const BrowserPluginHostMsg_Attach_Params& params);
   void OnPluginAtPositionResponse(int instance_id,
                                   int request_id,