Remove some content_child dependency from content_common

content/child/webmessageportchannel_impl.cc

 // Copyright (c) 2011 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/child/webmessageportchannel_impl.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "content/child/child_process.h"
 #include "content/child/child_thread.h"
@@ skipping 38 matching lines @@
     for (size_t i = 0; i < channel_array.size(); i++) {
       channel_array[i]->destroy();
     }
     message_queue_.pop();
   }
 
   if (message_port_id_ != MSG_ROUTING_NONE)
     Send(new MessagePortHostMsg_DestroyMessagePort(message_port_id_));
 
   if (route_id_ != MSG_ROUTING_NONE)
-    ChildThread::current()->RemoveRoute(route_id_);
+    ChildThread::current()->GetRouter()->RemoveRoute(route_id_);
 }
 
 void WebMessagePortChannelImpl::setClient(WebMessagePortChannelClient* client) {
   // Must lock here since client_ is called on the main thread.
   base::AutoLock auto_lock(lock_);
   client_ = client;
 }
 
 void WebMessagePortChannelImpl::destroy() {
   setClient(NULL);
@@ skipping 72 matching lines @@
         FROM_HERE, base::Bind(&WebMessagePortChannelImpl::Init, this));
     return;
   }
 
   if (route_id_ == MSG_ROUTING_NONE) {
     DCHECK(message_port_id_ == MSG_ROUTING_NONE);
     Send(new MessagePortHostMsg_CreateMessagePort(
         &route_id_, &message_port_id_));
   }
 
-  ChildThread::current()->AddRoute(route_id_, this);
+  ChildThread::current()->GetRouter()->AddRoute(route_id_, this);
 }
 
 void WebMessagePortChannelImpl::Entangle(
     scoped_refptr<WebMessagePortChannelImpl> channel) {
   if (!child_thread_loop_->BelongsToCurrentThread()) {
     child_thread_loop_->PostTask(
         FROM_HERE,
         base::Bind(&WebMessagePortChannelImpl::Entangle, this, channel));
     return;
   }
@@ skipping 23 matching lines @@
 
 void WebMessagePortChannelImpl::Send(IPC::Message* message) {
   if (!child_thread_loop_->BelongsToCurrentThread()) {
     DCHECK(!message->is_sync());
     child_thread_loop_->PostTask(
         FROM_HERE,
         base::Bind(&WebMessagePortChannelImpl::Send, this, message));
     return;
   }
 
-  ChildThread::current()->Send(message);
+  ChildThread::current()->GetRouter()->Send(message);
 }
 
 bool WebMessagePortChannelImpl::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(WebMessagePortChannelImpl, message)
     IPC_MESSAGE_HANDLER(MessagePortMsg_Message, OnMessage)
     IPC_MESSAGE_HANDLER(MessagePortMsg_MessagesQueued, OnMessagesQueued)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
@@ skipping 48 matching lines @@
 
   Release();
   ChildProcess::current()->ReleaseProcess();
 }
 
 WebMessagePortChannelImpl::Message::Message() {}
 
 WebMessagePortChannelImpl::Message::~Message() {}
 
 }  // namespace content