Move guest view container message routing out of content/.

content/renderer/browser_plugin/browser_plugin_manager.cc

 // Copyright (c) 2012 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 "content/renderer/browser_plugin/browser_plugin_manager.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/common/browser_plugin/browser_plugin_constants.h"
 #include "content/common/browser_plugin/browser_plugin_messages.h"
 #include "content/common/frame_messages.h"
 #include "content/public/renderer/browser_plugin_delegate.h"
-#include "content/public/renderer/content_renderer_client.h"
 #include "content/renderer/browser_plugin/browser_plugin.h"
 #include "content/renderer/render_thread_impl.h"
 #include "ipc/ipc_message_macros.h"
 
 namespace content {
 
 // static
 BrowserPluginManager* BrowserPluginManager::Get() {
   if (!RenderThreadImpl::current())
     return nullptr;
@@ skipping 58 matching lines @@
     if (iter.GetCurrentValue()->render_frame_routing_id() ==
         render_frame_routing_id) {
       iter.GetCurrentValue()->DidCommitCompositorFrame();
     }
     iter.Advance();
   }
 }
 
 bool BrowserPluginManager::OnControlMessageReceived(
     const IPC::Message& message) {
-  if (!BrowserPlugin::ShouldForwardToBrowserPlugin(message) &&
-      !content::GetContentClient()->renderer()->
-          ShouldForwardToGuestContainer(message)) {
+  if (!BrowserPlugin::ShouldForwardToBrowserPlugin(message))
     return false;
-  }
 
   int browser_plugin_instance_id = browser_plugin::kInstanceIDNone;
   // All allowed messages must have |browser_plugin_instance_id| as their
   // first parameter.
   PickleIterator iter(message);
   bool success = iter.ReadInt(&browser_plugin_instance_id);
   DCHECK(success);
   BrowserPlugin* plugin = GetBrowserPlugin(browser_plugin_instance_id);
   if (plugin && plugin->OnMessageReceived(message))
     return true;
@@ skipping 20 matching lines @@
 
   FrameHostMsg_CompositorFrameSwappedACK_Params params;
   params.producing_host_id = base::get<1>(param).producing_host_id;
   params.producing_route_id = base::get<1>(param).producing_route_id;
   params.output_surface_id = base::get<1>(param).output_surface_id;
   Send(new BrowserPluginHostMsg_CompositorFrameSwappedACK(
       base::get<0>(param), params));
 }
 
 }  // namespace content