Prepare chrome to use the new Mojo EDK by default.

mojo/edk/system/message_pipe_dispatcher.cc

 // Copyright 2015 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 "mojo/edk/system/message_pipe_dispatcher.h"
 
 #include "base/bind.h"
 #include "base/debug/stack_trace.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 400 matching lines @@
       calling_init_(false),
       write_error_(false),
       transferable_(transferable) {
 }
 
 MessagePipeDispatcher::~MessagePipeDispatcher() {
   // |Close()|/|CloseImplNoLock()| should have taken care of the channel. The
   // exception is if they posted a task to run CloseOnIO but the IO thread shut
   // down and so when it was deleting pending tasks it caused the last reference
   // to destruct this object. In that case, safe to destroy the channel.
-  if (channel_ && internal::g_io_thread_task_runner->RunsTasksOnCurrentThread())
-    channel_->Shutdown();
-  else
+  if (channel_ &&
+      internal::g_io_thread_task_runner->RunsTasksOnCurrentThread()) {
+    if (transferable_) {
+      channel_->Shutdown();
+    } else {
+      internal::g_broker->CloseMessagePipe(pipe_id_, this);
+    }
+  } else {
     DCHECK(!channel_);
+  }
 #if defined(OS_POSIX)
   ClosePlatformHandles(&serialized_fds_);
 #endif
 }
 
 void MessagePipeDispatcher::CancelAllAwakablesNoLock() {
   lock().AssertAcquired();
   awakable_list_.CancelAll();
 }
 
@@ skipping 559 matching lines @@
   // PostTask since the broker can call us back synchronously.
   internal::g_io_thread_task_runner->PostTask(
       FROM_HERE,
       base::Bind(&Broker::ConnectMessagePipe,
                  base::Unretained(internal::g_broker), pipe_id_,
                  base::Unretained(this)));
 }
 
 }  // namespace edk
 }  // namespace mojo