Revert 268939 "Pass RenderFrameHost to WebContentObservers' mess..."

trunk/src/chrome/browser/guest_view/web_view/plugin_permission_helper.cc

Index: trunk/src/chrome/browser/guest_view/web_view/plugin_permission_helper.cc
===================================================================
--- trunk/src/chrome/browser/guest_view/web_view/plugin_permission_helper.cc	(revision 269074)
+++ trunk/src/chrome/browser/guest_view/web_view/plugin_permission_helper.cc	(working copy)
@@ -26,26 +26,16 @@
 PluginPermissionHelper::~PluginPermissionHelper() {
 }
 
-bool PluginPermissionHelper::OnMessageReceived(
-    const IPC::Message& message,
-    content::RenderFrameHost* render_frame_host) {
+bool PluginPermissionHelper::OnMessageReceived(const IPC::Message& message) {
   IPC_BEGIN_MESSAGE_MAP(PluginPermissionHelper, message)
-    IPC_MESSAGE_HANDLER(ChromeViewHostMsg_BlockedOutdatedPlugin,
-                        OnBlockedOutdatedPlugin)
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_BlockedUnauthorizedPlugin,
                         OnBlockedUnauthorizedPlugin)
-    IPC_MESSAGE_HANDLER(ChromeViewHostMsg_NPAPINotSupported,
-                        OnNPAPINotSupported)
-    IPC_MESSAGE_UNHANDLED(return false)
-  IPC_END_MESSAGE_MAP()
-
-  return true;
-}
-
-bool PluginPermissionHelper::OnMessageReceived(const IPC::Message& message) {
-  IPC_BEGIN_MESSAGE_MAP(PluginPermissionHelper, message)
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_CouldNotLoadPlugin,
                         OnCouldNotLoadPlugin)
+    IPC_MESSAGE_HANDLER(ChromeViewHostMsg_BlockedOutdatedPlugin,
+                        OnBlockedOutdatedPlugin)
+    IPC_MESSAGE_HANDLER(ChromeViewHostMsg_NPAPINotSupported,
+                        OnNPAPINotSupported)
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_OpenAboutPlugins,
                         OnOpenAboutPlugins)
 #if defined(ENABLE_PLUGIN_INSTALLATION)