(NOT READY FOR REVIEW) Introduce MessagePortBypassFilter.

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 47 matching lines @@
   if (route_id_ != MSG_ROUTING_NONE)
     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::OnRouteRemoved() {
+  child_thread_loop_->ReleaseSoon(FROM_HERE, this);
+}
+
 void WebMessagePortChannelImpl::destroy() {
+  if (!child_thread_loop_->BelongsToCurrentThread()) {
+    child_thread_loop_->PostTask(
+        FROM_HERE, base::Bind(&WebMessagePortChannelImpl::destroy, this));
+    return;
+  }
   setClient(NULL);
 
+  if (route_id_ != MSG_ROUTING_NONE) {
+    ChildThread::current()->message_port_bypass_filter()->RemoveRoute(
+        route_id_,
+        base::Bind(&WebMessagePortChannelImpl::OnRouteRemoved, this));
+    return;
+  }
   // Release the object on the main thread, since the destructor might want to
   // send an IPC, and that has to happen on the main thread.
   child_thread_loop_->ReleaseSoon(FROM_HERE, this);
 }
 
 void WebMessagePortChannelImpl::entangle(WebMessagePortChannel* channel) {
   // The message port ids might not be set up yet, if this channel wasn't
   // created on the main thread.  So need to wait until we're on the main thread
   // before getting the other message port id.
   scoped_refptr<WebMessagePortChannelImpl> webchannel(
@@ skipping 61 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()->message_port_bypass_filter()->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 93 matching lines @@
 
   Release();
   ChildProcess::current()->ReleaseProcess();
 }
 
 WebMessagePortChannelImpl::Message::Message() {}
 
 WebMessagePortChannelImpl::Message::~Message() {}
 
 }  // namespace content