Browser Plugin: Reduce code repetition in BrowserPluginManager.

content/renderer/browser_plugin/browser_plugin.h

Index: content/renderer/browser_plugin/browser_plugin.h
diff --git a/content/renderer/browser_plugin/browser_plugin.h b/content/renderer/browser_plugin/browser_plugin.h
index 3a1bf2ea1dfe5d4fe49d20f7a5ce7b4efa15b495..4874b66a81b926e525ef9e46cd678c0e16864dd5 100644
--- a/content/renderer/browser_plugin/browser_plugin.h
+++ b/content/renderer/browser_plugin/browser_plugin.h
@@ -30,12 +30,15 @@ class BrowserPluginManager;
 class MockBrowserPlugin;
 
 class CONTENT_EXPORT BrowserPlugin :
-    NON_EXPORTED_BASE(public WebKit::WebPlugin) {
+    NON_EXPORTED_BASE(public WebKit::WebPlugin),
+    public IPC::Listener {

[sadrul, 2012/12/14 16:08:39]

The plugin doesn't need to be an IPC::Listener, right? From what I can see, it
receives messages only from the BrowserPluginManager. So it doesn't actually
need to be a listener?

[Fady Samuel, 2012/12/14 17:05:54]

It does not and I don't have immediate plans to pass it in to methods that
expect an IPC::Listener. Removed. Thanks!

  public:
   RenderViewImpl* render_view() const { return render_view_.get(); }
   // Called only by tests to clean up before we blow away the MockRenderProcess.
   void Cleanup();
 
+  virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
+
   // Update Browser Plugin's DOM Node attribute |attribute_name| with the value
   // |attribute_value|.
   void UpdateDOMAttribute(const std::string& attribute_name,
@@ -84,32 +87,6 @@ class CONTENT_EXPORT BrowserPlugin :
   bool SetPartitionAttribute(const std::string& partition_id,
                              std::string* error_message);
 
-  // Inform the BrowserPlugin to update its backing store with the pixels in
-  // its damage buffer.
-  void UpdateRect(int message_id,
-                  const BrowserPluginMsg_UpdateRect_Params& params);
-  // Inform the BrowserPlugin that its guest process is gone.
-  void GuestGone(int process_id, base::TerminationStatus status);
-  // Inform the BrowserPlugin that the guest process is unresponsive.
-  void GuestUnresponsive(int process_id);
-  // Inform the BrowserPlugin that the guest process is responsive again after
-  // being reported as unresponsive.
-  void GuestResponsive(int process_id);
-  // Inform the BrowserPlugin that the guest has navigated to a new URL.
-  void LoadCommit(const BrowserPluginMsg_LoadCommit_Params& params);
-  // Inform the BrowserPlugin that the guest has started loading a new page.
-  void LoadStart(const GURL& url, bool is_top_level);
-  // Inform the BrowserPlugin that the guest has finished loading a new page.
-  void LoadStop();
-  // Inform the BrowserPlugin that the guest has aborted loading a new page.
-  void LoadAbort(const GURL& url, bool is_top_level, const std::string& type);
-  // Inform the BrowserPlugin that the guest has redirected a navigation.
-  void LoadRedirect(const GURL& old_url,
-                    const GURL& new_url,
-                    bool is_top_level);
-  // Tells the BrowserPlugin to advance the focus to the next (or previous)
-  // element.
-  void AdvanceFocus(bool reverse);
   // Inform the BrowserPlugin of the focus state of the embedder RenderView.
   void SetEmbedderFocus(bool focused);
   // Informs the guest of an updated focus state.
@@ -117,14 +94,6 @@ class CONTENT_EXPORT BrowserPlugin :
   // Indicates whether the guest should be focused.
   bool ShouldGuestBeFocused() const;
 
-  // Inform the BrowserPlugin that the guest's contentWindow is ready,
-  // and provide it with a routing ID to grab it.
-  void GuestContentWindowReady(int content_window_routing_id);
-
-  // Informs the BrowserPlugin that the guest has started/stopped accepting
-  // touch events.
-  void SetAcceptTouchEvents(bool accept);
-
   // Tells the BrowserPlugin to tell the guest to navigate to the previous
   // navigation entry in the navigation history.
   void Back();
@@ -142,9 +111,6 @@ class CONTENT_EXPORT BrowserPlugin :
   // A request from Javascript has been made to reload the page.
   void Reload();
 
-  // Informs the BrowserPlugin of the cursor that the guest has requested.
-  void SetCursor(const WebCursor& cursor);
-
   // Returns true if |point| lies within the bounds of the plugin rectangle.
   // Not OK to use this function for making security-sensitive decision since it
   // can return false positives when the plugin has rotation transformation
@@ -282,6 +248,32 @@ class CONTENT_EXPORT BrowserPlugin :
       const TransportDIB::Handle& other_damage_buffer_handle);
 #endif
 
+  // IPC message handlers.
+  // Please keep in alphabetical order.
+  void OnAdvanceFocus(int instance_id, bool reverse);
+  void OnGuestContentWindowReady(int instance_id,
+                                 int content_window_routing_id);
+  void OnGuestGone(int instance_id, int process_id, int status);
+  void OnGuestResponsive(int instance_id, int process_id);
+  void OnGuestUnresponsive(int instance_id, int process_id);
+  void OnLoadAbort(int instance_id,
+                   const GURL& url,
+                   bool is_top_level,
+                   const std::string& type);
+  void OnLoadCommit(int instance_id,
+                    const BrowserPluginMsg_LoadCommit_Params& params);
+  void OnLoadRedirect(int instance_id,
+                      const GURL& old_url,
+                      const GURL& new_url,
+                      bool is_top_level);
+  void OnLoadStart(int instance_id, const GURL& url, bool is_top_level);
+  void OnLoadStop(int instance_id);
+  void OnSetCursor(int instance_id, const WebCursor& cursor);
+  void OnShouldAcceptTouchEvents(int instance_id, bool accept);
+  void OnUpdateRect(int instance_id,
+                    int message_id,
+                    const BrowserPluginMsg_UpdateRect_Params& params);
+
   int instance_id_;
   base::WeakPtr<RenderViewImpl> render_view_;
   // We cache the |render_view_|'s routing ID because we need it on destruction.