Fix message routing for BrowserPlugin in iframe

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 79c8cf5a51c8efa6884bb4ac857f452f1e294422..d6238eb982f75d4ec5fe371a7de405977bfff541 100644
--- a/content/renderer/browser_plugin/browser_plugin.h
+++ b/content/renderer/browser_plugin/browser_plugin.h
@@ -25,7 +25,6 @@ namespace content {
 class BrowserPluginDelegate;
 class ChildFrameCompositingHelper;
 class BrowserPluginManager;
-class MockBrowserPlugin;

[lazyboy, 2014/12/16 23:57:30]

This was lingering around it seems, great!
nit: Can you also sort this block?

[Fady Samuel, 2014/12/17 19:30:35]

Done.

 
 class CONTENT_EXPORT BrowserPlugin :
     NON_EXPORTED_BASE(public blink::WebPlugin),
@@ -37,9 +36,6 @@ class CONTENT_EXPORT BrowserPlugin :
   int render_view_routing_id() const { return render_view_routing_id_; }
   int browser_plugin_instance_id() const { return browser_plugin_instance_id_; }
   bool attached() const { return attached_; }
-  BrowserPluginManager* browser_plugin_manager() const {
-    return browser_plugin_manager_.get();
-  }
 
   bool OnMessageReceived(const IPC::Message& msg);
 
@@ -141,9 +137,6 @@ class CONTENT_EXPORT BrowserPlugin :
   // Only the manager is allowed to create a BrowserPlugin.
   friend class BrowserPluginManager;
 
-  // For unit/integration tests.
-  friend class MockBrowserPlugin;
-
   // A BrowserPlugin object is a controller that represents an instance of a
   // browser plugin within the embedder renderer process. Once a BrowserPlugin
   // does an initial navigation or is attached to a newly created guest, it
@@ -208,11 +201,6 @@ class CONTENT_EXPORT BrowserPlugin :
   // This indicates that the BrowserPlugin has a geometry.
   bool ready_;
 
-  // BrowserPlugin outlives RenderViewImpl in Chrome Apps and so we need to
-  // store the BrowserPlugin's BrowserPluginManager in a member variable to
-  // avoid accessing the RenderViewImpl.
-  const scoped_refptr<BrowserPluginManager> browser_plugin_manager_;
-
   // Used for HW compositing.
   scoped_refptr<ChildFrameCompositingHelper> compositing_helper_;