Fix message routing for BrowserPlugin in iframe

extensions/renderer/guest_view/guest_view_container.h

Index: extensions/renderer/guest_view/guest_view_container.h
diff --git a/extensions/renderer/guest_view/guest_view_container.h b/extensions/renderer/guest_view/guest_view_container.h
index 965dfd6437d5f5607ba4188a96d7ef2b8cc0e912..57a30da6bbaa7d51ef20b9b7c0c575978a491130 100644
--- a/extensions/renderer/guest_view/guest_view_container.h
+++ b/extensions/renderer/guest_view/guest_view_container.h
@@ -11,28 +11,25 @@
 
 namespace extensions {
 
-class GuestViewContainer : public content::BrowserPluginDelegate,
-                           public content::RenderFrameObserver {
+class GuestViewContainer : public content::BrowserPluginDelegate {
  public:
   explicit GuestViewContainer(content::RenderFrame* render_frame);
   ~GuestViewContainer() override;
 
+  // Queries whether GuestViewContainer is interested in the |message|.
+  static bool HandlesMessage(const IPC::Message& message);
+
   // BrowserPluginDelegate implementation.
   void SetElementInstanceID(int element_instance_id) override;
 
-  // RenderFrameObserver override.
-  void OnDestruct() override;
-  bool OnMessageReceived(const IPC::Message& message) override;
-
-  virtual bool HandlesMessage(const IPC::Message& message) = 0;
-  virtual bool OnMessage(const IPC::Message& message) = 0;
-
   int element_instance_id() const { return element_instance_id_; }
   int render_view_routing_id() const { return render_view_routing_id_; }
+  content::RenderFrame* render_frame() const { return render_frame_; }
 
  private:
   int element_instance_id_;
-  int render_view_routing_id_;
+  const int render_view_routing_id_;
+  content::RenderFrame* const render_frame_;
 
   DISALLOW_COPY_AND_ASSIGN(GuestViewContainer);
 };