[Extensions] Clean up the handling of ExtensionHostMsg_Request

extensions/browser/guest_view/extension_view/extension_view_guest.cc

 // Copyright 2015 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/browser/guest_view/extension_view/extension_view_guest.h"
 
 #include "base/strings/string_util.h"
 #include "components/crx_file/id_util.h"
 #include "components/guest_view/browser/guest_view_event.h"
 #include "content/public/browser/render_process_host.h"
@@ skipping 10 matching lines @@
 using guest_view::GuestViewEvent;
 using namespace extensions::core_api;
 
 namespace extensions {
 
 // static
 const char ExtensionViewGuest::Type[] = "extensionview";
 
 ExtensionViewGuest::ExtensionViewGuest(
     content::WebContents* owner_web_contents)
-    : GuestView<ExtensionViewGuest>(owner_web_contents),
-      extension_view_guest_delegate_(
-          extensions::ExtensionsAPIClient::Get()
-              ->CreateExtensionViewGuestDelegate(this)) {
+    : GuestView<ExtensionViewGuest>(owner_web_contents) {
 }
 
 ExtensionViewGuest::~ExtensionViewGuest() {
 }
 
 // static
 GuestViewBase* ExtensionViewGuest::Create(
     content::WebContents* owner_web_contents) {
   return new ExtensionViewGuest(owner_web_contents);
 }
@@ skipping 52 matching lines @@
       content::SiteInstance::CreateForURL(browser_context(),
                                           extension_url_);
 
   WebContents::CreateParams params(browser_context(), view_site_instance);
   params.guest_delegate = this;
   callback.Run(WebContents::Create(params));
 }
 
 void ExtensionViewGuest::DidInitialize(
     const base::DictionaryValue& create_params) {
-  extension_function_dispatcher_.reset(
-      new extensions::ExtensionFunctionDispatcher(browser_context(), this));
-
-  if (extension_view_guest_delegate_)
-    extension_view_guest_delegate_->DidInitialize();
+  ExtensionsAPIClient::Get()->AttachWebContentsHelpers(web_contents());
 
   ApplyAttributes(create_params);
 }
 
 void ExtensionViewGuest::DidAttachToEmbedder() {
   ApplyAttributes(*attach_params());
 }
 
 const char* ExtensionViewGuest::GetAPINamespace() const {
   return extensionview::kAPINamespace;
@@ skipping 28 matching lines @@
 
 void ExtensionViewGuest::DidNavigateMainFrame(
     const content::LoadCommittedDetails& details,
     const content::FrameNavigateParams& params) {
   if (attached() && (params.url.GetOrigin() != view_page_.GetOrigin())) {
     bad_message::ReceivedBadMessage(web_contents()->GetRenderProcessHost(),
                                     bad_message::EVG_BAD_ORIGIN);
   }
 }
 
-bool ExtensionViewGuest::OnMessageReceived(const IPC::Message& message) {
-  bool handled = true;
-  IPC_BEGIN_MESSAGE_MAP(ExtensionViewGuest, message)
-  IPC_MESSAGE_HANDLER(ExtensionHostMsg_Request, OnRequest)
-  IPC_MESSAGE_UNHANDLED(handled = false)
-  IPC_END_MESSAGE_MAP()
-  return handled;
-}
-
-// Private
-void ExtensionViewGuest::OnRequest(
-    const ExtensionHostMsg_Request_Params& params) {
-  extension_function_dispatcher_->Dispatch(params,
-                                           web_contents()->GetRenderViewHost());
-}
-
 void ExtensionViewGuest::ApplyAttributes(const base::DictionaryValue& params) {
   std::string src;
   params.GetString(extensionview::kAttributeSrc, &src);
   NavigateGuest(src, false /* force_navigation */);
 }
 
 }  // namespace extensions