[Extensions] Clean up the handling of ExtensionHostMsg_Request

extensions/browser/extension_web_contents_observer.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/browser/extension_web_contents_observer.h"
 
 #include "content/public/browser/child_process_security_policy.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
@@ skipping 27 matching lines @@
   if (!url.SchemeIs(kExtensionScheme))
     return nullptr;
 
   return ExtensionRegistry::Get(browser_context)
       ->enabled_extensions()
       .GetExtensionOrAppByURL(url);
 }
 
 }  // namespace
 
+// static
+ExtensionWebContentsObserver* ExtensionWebContentsObserver::GetForWebContents(
+    content::WebContents* web_contents) {
+  return ExtensionsBrowserClient::Get()->GetExtensionWebContentsObserver(
+      web_contents);
+}
+
 ExtensionWebContentsObserver::ExtensionWebContentsObserver(
     content::WebContents* web_contents)
     : content::WebContentsObserver(web_contents),
-      browser_context_(web_contents->GetBrowserContext()) {
+      browser_context_(web_contents->GetBrowserContext()),
+      dispatcher_(browser_context_) {
   NotifyRenderViewType(web_contents->GetRenderViewHost());
   content::RenderFrameHost* host = web_contents->GetMainFrame();
   if (host)
     RenderFrameHostChanged(nullptr, host);
+  dispatcher_.set_delegate(this);
 }
 
 ExtensionWebContentsObserver::~ExtensionWebContentsObserver() {
 }
 
+content::WebContents* ExtensionWebContentsObserver::GetAssociatedWebContents()
+    const {
+  return web_contents();
+}
+
 void ExtensionWebContentsObserver::RenderViewCreated(
     content::RenderViewHost* render_view_host) {
   NotifyRenderViewType(render_view_host);
 
   const Extension* extension = GetExtension(render_view_host);
   if (!extension)
     return;
 
   content::RenderProcessHost* process = render_view_host->GetProcess();
 
@@ skipping 32 matching lines @@
 
 void ExtensionWebContentsObserver::RenderFrameCreated(
     content::RenderFrameHost* render_frame_host) {
   const Extension* extension = GetExtensionForRenderFrame(render_frame_host);
   if (extension) {
     ExtensionsBrowserClient::Get()->RegisterMojoServices(render_frame_host,
                                                          extension);
   }
 }
 
+bool ExtensionWebContentsObserver::OnMessageReceived(
+    const IPC::Message& message) {
+  bool handled = true;
+  IPC_BEGIN_MESSAGE_MAP(ExtensionWebContentsObserver, message)
+    IPC_MESSAGE_HANDLER(ExtensionHostMsg_Request, OnRequest)
+    IPC_MESSAGE_UNHANDLED(handled = false)
+  IPC_END_MESSAGE_MAP()
+  return handled;
+}
+
 void ExtensionWebContentsObserver::FrameDeleted(
     content::RenderFrameHost* render_frame_host) {
   ProcessManager::Get(browser_context_)->UnregisterRenderFrameHost(
       render_frame_host);
 }
 
 void ExtensionWebContentsObserver::RenderFrameHostChanged(
     content::RenderFrameHost* old_host,
     content::RenderFrameHost* new_host) {
   ProcessManager* process_manager = ProcessManager::Get(browser_context_);
@@ skipping 59 matching lines @@
   // (excluding bookmark apps) will have a chrome-extension:// URL for their
   // site, so we can ignore that wrinkle here.
   const GURL& site = render_view_host->GetSiteInstance()->GetSiteURL();
 
   if (!site.SchemeIs(kExtensionScheme))
     return std::string();
 
   return site.host();
 }
 
+void ExtensionWebContentsObserver::OnRequest(
+    const ExtensionHostMsg_Request_Params& params) {
+  dispatcher_.Dispatch(params, web_contents()->GetRenderViewHost());
+}
+
 }  // namespace extensions