Fix message routing for BrowserPlugin in iframe

extensions/renderer/guest_view/extensions_guest_view_container.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "extensions/renderer/guest_view/extensions_guest_view_container.h"
 
 #include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_view.h"
 #include "extensions/common/extension_messages.h"
 #include "extensions/common/guest_view/guest_view_constants.h"
@@ skipping 168 matching lines @@
   PerformPendingRequest();
 }
 
 void ExtensionsGuestViewContainer::RegisterDestructionCallback(
     v8::Handle<v8::Function> callback,
     v8::Isolate* isolate) {
   destruction_callback_.reset(callback);
   destruction_isolate_ = isolate;
 }
 
+bool ExtensionsGuestViewContainer::OnMessageReceived(
+    const IPC::Message& message) {
+  OnHandleCallback(message);
+  return true;
+}
+
 void ExtensionsGuestViewContainer::SetElementInstanceID(
     int element_instance_id) {
   GuestViewContainer::SetElementInstanceID(element_instance_id);
 
   DCHECK(g_guest_view_container_map.Get().find(element_instance_id) ==
             g_guest_view_container_map.Get().end());
   g_guest_view_container_map.Get().insert(
       std::make_pair(element_instance_id, this));
 }
 
 void ExtensionsGuestViewContainer::Ready() {
   ready_ = true;
   CHECK(!pending_response_.get());
   PerformPendingRequest();
 }
 
-bool ExtensionsGuestViewContainer::HandlesMessage(const IPC::Message& message) {
-  return (message.type() == ExtensionMsg_GuestAttached::ID) ||
-      (message.type() == ExtensionMsg_GuestDetached::ID);
-}
-
-bool ExtensionsGuestViewContainer::OnMessage(const IPC::Message& message) {
-  OnHandleCallback(message);
-  return true;
-}
-
 void ExtensionsGuestViewContainer::OnHandleCallback(
     const IPC::Message& message) {
   // Handle the callback for the current request with a pending response.
   HandlePendingResponseCallback(message);
   // Perform the subsequent attach request if one exists.
   PerformPendingRequest();
 }
 
 void ExtensionsGuestViewContainer::EnqueueRequest(linked_ptr<Request> request) {
   pending_requests_.push_back(request);
@@ skipping 10 matching lines @@
 }
 
 void ExtensionsGuestViewContainer::HandlePendingResponseCallback(
     const IPC::Message& message) {
   CHECK(pending_response_.get());
   linked_ptr<Request> pending_response(pending_response_.release());
   pending_response->HandleResponse(message);
 }
 
 }  // namespace extensions