Move guest view container message routing out of content/.

extensions/shell/renderer/shell_content_renderer_client.cc

Index: extensions/shell/renderer/shell_content_renderer_client.cc
diff --git a/extensions/shell/renderer/shell_content_renderer_client.cc b/extensions/shell/renderer/shell_content_renderer_client.cc
index 2646c284ba8225cd2cbbba2fc361d90970c4f367..cbd9f92ef2876622ea1535fa3bac20e532a9ebf5 100644
--- a/extensions/shell/renderer/shell_content_renderer_client.cc
+++ b/extensions/shell/renderer/shell_content_renderer_client.cc
@@ -4,7 +4,6 @@
 
 #include "extensions/shell/renderer/shell_content_renderer_client.h"
 
-#include "components/guest_view/renderer/guest_view_container.h"
 #include "content/public/common/content_constants.h"
 #include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_frame_observer.h"
@@ -16,10 +15,10 @@
 #include "extensions/renderer/extension_frame_helper.h"
 #include "extensions/renderer/extension_helper.h"
 #include "extensions/renderer/guest_view/extensions_guest_view_container.h"
+#include "extensions/renderer/guest_view/extensions_guest_view_container_observer.h"
 #include "extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.h"
 #include "extensions/shell/common/shell_extensions_client.h"
 #include "extensions/shell/renderer/shell_extensions_renderer_client.h"
-#include "ipc/ipc_message_macros.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 
 #if !defined(DISABLE_NACL)
@@ -57,6 +56,10 @@ void ShellContentRendererClient::RenderThreadStarted() {
       new Dispatcher(extension_dispatcher_delegate_.get()));
   thread->AddObserver(extension_dispatcher_.get());
 
+  guest_view_container_observer_.reset(
+      new ExtensionsGuestViewContainerObserver());
+  thread->AddObserver(guest_view_container_observer_.get());
+
   // TODO(jamescook): Init WebSecurityPolicy for chrome-extension: schemes.
   // See ChromeContentRendererClient for details.
 }
@@ -96,12 +99,6 @@ blink::WebPlugin* ShellContentRendererClient::CreatePluginReplacement(
   return NULL;
 }
 
-bool ShellContentRendererClient::ShouldForwardToGuestContainer(
-    const IPC::Message& msg) {
-  return (IPC_MESSAGE_CLASS(msg) == GuestViewMsgStart) ||
-      (IPC_MESSAGE_CLASS(msg) == ExtensionsGuestViewMsgStart);
-}
-
 bool ShellContentRendererClient::WillSendRequest(
     blink::WebFrame* frame,
     ui::PageTransition transition_type,