Remove some content_child dependency from content_common

content/renderer/websharedworker_proxy.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/renderer/websharedworker_proxy.h"
 
-#include "content/child/child_thread.h"
 #include "content/child/webmessageportchannel_impl.h"
+#include "content/common/message_router.h"
 #include "content/common/view_messages.h"
 #include "content/common/worker_messages.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 #include "third_party/WebKit/public/web/WebSharedWorkerClient.h"
 
 namespace content {
 
-WebSharedWorkerProxy::WebSharedWorkerProxy(ChildThread* child_thread,
+WebSharedWorkerProxy::WebSharedWorkerProxy(MessageRouter* router,
                                            unsigned long long document_id,
                                            int route_id,
                                            int render_frame_route_id)
     : route_id_(route_id),
       render_frame_route_id_(render_frame_route_id),
-      child_thread_(child_thread),
+      router_(router),
       document_id_(document_id),
       pending_route_id_(route_id),
       connect_listener_(NULL),
       created_(false) {
-  child_thread_->AddRoute(route_id_, this);
+  router_->AddRoute(route_id_, this);
 }
 
 WebSharedWorkerProxy::~WebSharedWorkerProxy() {
   Disconnect();
 
   // Free up any unsent queued messages.
   for (size_t i = 0; i < queued_messages_.size(); ++i)
     delete queued_messages_[i];
 }
 
 void WebSharedWorkerProxy::Disconnect() {
   if (route_id_ == MSG_ROUTING_NONE)
     return;
 
   // So the messages from WorkerContext (like WorkerContextDestroyed) do not
   // come after nobody is listening. Since Worker and WorkerContext can
   // terminate independently, already sent messages may still be in the pipe.
-  child_thread_->RemoveRoute(route_id_);
+  router_->RemoveRoute(route_id_);
 
   route_id_ = MSG_ROUTING_NONE;
 }
 
 bool WebSharedWorkerProxy::Send(IPC::Message* message) {
   // It's possible that messages will be sent before the worker is created, in
   // which case route_id_ will be none.  Or the worker object can be interacted
   // with before the browser process told us that it started, in which case we
   // also want to queue the message.
   if (!created_) {
     queued_messages_.push_back(message);
     return true;
   }
 
   // For now we proxy all messages to the worker process through the browser.
   // Revisit if we find this slow.
   // TODO(jabdelmalek): handle sync messages if we need them.
   IPC::Message* wrapped_msg = new ViewHostMsg_ForwardToWorker(*message);
   delete message;
-  return child_thread_->Send(wrapped_msg);
+  return router_->Send(wrapped_msg);
 }
 
 void WebSharedWorkerProxy::SendQueuedMessages() {
   DCHECK(queued_messages_.size());
   std::vector<IPC::Message*> queued_messages = queued_messages_;
   queued_messages_.clear();
   for (size_t i = 0; i < queued_messages.size(); ++i) {
     queued_messages[i]->set_routing_id(route_id_);
     Send(queued_messages[i]);
   }
@@ skipping 40 matching lines @@
 }
 
 void WebSharedWorkerProxy::OnWorkerConnected() {
   if (connect_listener_) {
     // This can result in this object being freed.
     connect_listener_->connected();
   }
 }
 
 }  // namespace content