Browser Plugin: Implement BrowserPluginObserver.

content/renderer/browser_plugin/browser_plugin_manager_impl.cc

Index: content/renderer/browser_plugin/browser_plugin_manager_impl.cc
diff --git a/content/renderer/browser_plugin/browser_plugin_manager_impl.cc b/content/renderer/browser_plugin/browser_plugin_manager_impl.cc
index 3c77fca165b9ed4615b78d356d118509c61387a3..b5a27cf5d136a19b2f85781deefb04a34e5e3390 100644
--- a/content/renderer/browser_plugin/browser_plugin_manager_impl.cc
+++ b/content/renderer/browser_plugin/browser_plugin_manager_impl.cc
@@ -5,7 +5,7 @@
 #include "content/renderer/browser_plugin/browser_plugin_manager_impl.h"
 
 #include "content/common/browser_plugin_messages.h"
-#include "content/renderer/browser_plugin/browser_plugin.h"
+#include "content/renderer/browser_plugin/browser_plugin_impl.h"
 #include "content/renderer/render_thread_impl.h"
 #include "ui/gfx/point.h"
 #include "webkit/glue/webcursor.h"
@@ -21,15 +21,15 @@ BrowserPluginManagerImpl::BrowserPluginManagerImpl(
 BrowserPluginManagerImpl::~BrowserPluginManagerImpl() {
 }
 
-BrowserPlugin* BrowserPluginManagerImpl::CreateBrowserPlugin(
+BrowserPluginImpl* BrowserPluginManagerImpl::CreateBrowserPlugin(
     RenderViewImpl* render_view,
     WebKit::WebFrame* frame,
     const WebKit::WebPluginParams& params) {
-  return new BrowserPlugin(render_view, frame, params);
+  return new BrowserPluginImpl(render_view, frame, params);
 }
 
 void BrowserPluginManagerImpl::AllocateInstanceID(
-    BrowserPlugin* browser_plugin) {
+    BrowserPluginImpl* browser_plugin) {
   int request_id = request_id_counter_++;
   pending_allocate_instance_id_requests_.AddWithID(browser_plugin, request_id);
   Send(new BrowserPluginHostMsg_AllocateInstanceID(
@@ -48,7 +48,7 @@ bool BrowserPluginManagerImpl::OnMessageReceived(
     PickleIterator iter(message);
     bool success = iter.ReadInt(&instance_id);
     DCHECK(success);
-    BrowserPlugin* plugin = GetBrowserPlugin(instance_id);
+    BrowserPluginImpl* plugin = GetBrowserPlugin(instance_id);
     if (plugin && plugin->OnMessageReceived(message))
       return true;
   }
@@ -68,7 +68,7 @@ bool BrowserPluginManagerImpl::OnMessageReceived(
 
 void BrowserPluginManagerImpl::OnAllocateInstanceIDACK(
     const IPC::Message& message, int request_id, int instance_id) {
-  BrowserPlugin* plugin =
+  BrowserPluginImpl* plugin =
       pending_allocate_instance_id_requests_.Lookup(request_id);
   pending_allocate_instance_id_requests_.Remove(request_id);
   if (plugin)
@@ -80,10 +80,10 @@ void BrowserPluginManagerImpl::OnPluginAtPositionRequest(
     int request_id,
     const gfx::Point& position) {
   int instance_id = -1;
-  IDMap<BrowserPlugin>::iterator it(&instances_);
+  IDMap<BrowserPluginImpl>::iterator it(&instances_);
   gfx::Point local_position = position;
   while (!it.IsAtEnd()) {
-    const BrowserPlugin* plugin = it.GetCurrentValue();
+    const BrowserPluginImpl* plugin = it.GetCurrentValue();
     if (plugin->InBounds(position)) {
       instance_id = plugin->instance_id();
       local_position = plugin->ToLocalCoordinates(position);
@@ -122,6 +122,8 @@ bool BrowserPluginManagerImpl::ShouldForwardToBrowserPlugin(
     const IPC::Message& message) {
   switch (message.type()) {
     case BrowserPluginMsg_AdvanceFocus::ID:
+    case BrowserPluginMsg_BuffersSwapped::ID:
+    case BrowserPluginMsg_ForwardMessage::ID:
     case BrowserPluginMsg_GuestContentWindowReady::ID:
     case BrowserPluginMsg_GuestGone::ID:
     case BrowserPluginMsg_GuestResponsive::ID:
@@ -136,7 +138,6 @@ bool BrowserPluginManagerImpl::ShouldForwardToBrowserPlugin(
     case BrowserPluginMsg_ShouldAcceptTouchEvents::ID:
     case BrowserPluginMsg_UpdatedName::ID:
     case BrowserPluginMsg_UpdateRect::ID:
-    case BrowserPluginMsg_BuffersSwapped::ID:
       return true;
     default:
       break;