GuestView: Fix message routing across embedder navigations

content/browser/browser_plugin/browser_plugin_embedder.h

 // 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.
 
 // A BrowserPluginEmbedder handles messages coming from a BrowserPlugin's
 // embedder that are not directed at any particular existing guest process.
 // In the beginning, when a BrowserPlugin instance in the embedder renderer
 // process requests an initial navigation, the WebContents for that renderer
 // renderer creates a BrowserPluginEmbedder for itself. The
 // BrowserPluginEmbedder, in turn, forwards the requests to a
@@ skipping 33 matching lines @@
   static BrowserPluginEmbedder* Create(WebContentsImpl* web_contents);
 
   // Returns this embedder's WebContentsImpl.
   WebContentsImpl* GetWebContents() const;
 
   // Called when embedder's |rwh| has sent screen rects to renderer.
   void DidSendScreenRects();
 
   // 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);
 
   void OnUpdateDragCursor(bool* handled);
 
   void DragEnteredGuest(BrowserPluginGuest* guest);
 
   void DragLeftGuest(BrowserPluginGuest* guest);
 
@@ skipping 25 matching lines @@
   static bool UnlockMouseIfNecessaryCallback(bool* mouse_unlocked,
                                              WebContents* guest);
 
   static bool FindInGuest(int request_id,
                           const base::string16& search_text,
                           const blink::WebFindOptions& options,
                           WebContents* guest);
   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,
                                   const gfx::Point& position);
 
   // Used to correctly update the cursor when dragging over a guest, and to
   // handle a race condition when dropping onto the guest that started the drag
   // (the race is that the dragend message arrives before the drop message so
   // the drop never takes place).
   // crbug.com/233571
   base::WeakPtr<BrowserPluginGuest> guest_dragging_over_;
 
   // Pointer to the guest that started the drag, used to forward necessary drag
   // status messages to the correct guest.
   base::WeakPtr<BrowserPluginGuest> guest_started_drag_;
 
   // Keeps track of "dragend" state.
   bool guest_drag_ending_;
 
   base::WeakPtrFactory<BrowserPluginEmbedder> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserPluginEmbedder);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_BROWSER_PLUGIN_BROWSER_PLUGIN_EMBEDDER_H_