Move IPC::MessageFilter and router to a separate file

content/public/test/mock_render_thread.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/public/test/mock_render_thread.h"
 
 #include "base/message_loop/message_loop_proxy.h"
 #include "content/common/frame_messages.h"
 #include "content/common/view_messages.h"
 #include "content/public/renderer/render_process_observer.h"
 #include "content/renderer/render_view_impl.h"
+#include "ipc/ipc_message_filter.h"
 #include "ipc/ipc_message_utils.h"
 #include "ipc/ipc_sync_message.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/public/web/WebScriptController.h"
 
 namespace content {
 
 MockRenderThread::MockRenderThread()
     : routing_id_(0),
       surface_id_(0),
       opener_id_(0),
       new_window_routing_id_(0),
       new_window_main_frame_routing_id_(0),
       new_frame_routing_id_(0) {
 }
 
 MockRenderThread::~MockRenderThread() {
   while (!filters_.empty()) {
-    scoped_refptr<IPC::ChannelProxy::MessageFilter> filter = filters_.back();
+    scoped_refptr<IPC::MessageFilter> filter = filters_.back();
     filters_.pop_back();
     filter->OnFilterRemoved();
   }
 }
 
 // Called by the Widget. Used to send messages to the browser.
 // We short-circuit the mechanism and handle the messages right here on this
 // class.
 bool MockRenderThread::Send(IPC::Message* msg) {
   // We need to simulate a synchronous channel, thus we are going to receive
@@ skipping 45 matching lines @@
 }
 
 void MockRenderThread::RemoveRoute(int32 routing_id) {
 }
 
 int MockRenderThread::GenerateRoutingID() {
   NOTREACHED();
   return MSG_ROUTING_NONE;
 }
 
-void MockRenderThread::AddFilter(IPC::ChannelProxy::MessageFilter* filter) {
+void MockRenderThread::AddFilter(IPC::MessageFilter* filter) {
   filter->OnFilterAdded(&sink());
   // Add this filter to a vector so the MockRenderThread::RemoveFilter function
   // can check if this filter is added.
   filters_.push_back(make_scoped_refptr(filter));
 }
 
-void MockRenderThread::RemoveFilter(IPC::ChannelProxy::MessageFilter* filter) {
+void MockRenderThread::RemoveFilter(IPC::MessageFilter* filter) {
   // Emulate the IPC::ChannelProxy::OnRemoveFilter function.
   for (size_t i = 0; i < filters_.size(); ++i) {
     if (filters_[i].get() == filter) {
       filter->OnFilterRemoved();
       filters_.erase(filters_.begin() + i);
       return;
     }
   }
   NOTREACHED() << "filter to be removed not found";
 }
@@ skipping 137 matching lines @@
 void MockRenderThread::OnDuplicateSection(
     base::SharedMemoryHandle renderer_handle,
     base::SharedMemoryHandle* browser_handle) {
   // We don't have to duplicate the input handles since RenderViewTest does not
   // separate a browser process from a renderer process.
   *browser_handle = renderer_handle;
 }
 #endif  // defined(OS_WIN)
 
 }  // namespace content