Fix shutdown assert with the new Mojo EDK.

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 600 matching lines @@
   return MOJO_RESULT_OK;
 }
 
 MojoResult MessagePipeDispatcher::ReadMessageImplNoLock(
     void* bytes,
     uint32_t* num_bytes,
     DispatcherVector* dispatchers,
     uint32_t* num_dispatchers,
     MojoReadMessageFlags flags) {
   lock().AssertAcquired();
-  if (channel_) {
+  if (transferable_ && channel_) {
     channel_->EnsureLazyInitialized();
   } else if (!transferable_) {
     if (non_transferable_state_ == WAITING_FOR_READ_OR_WRITE) {
       RequestNontransferableChannel();
       return MOJO_RESULT_SHOULD_WAIT;
     } else if (non_transferable_state_ == CONNECT_CALLED) {
       return MOJO_RESULT_SHOULD_WAIT;
     }
   }
 
@@ skipping 79 matching lines @@
   rv.satisfiable_signals |= MOJO_HANDLE_SIGNAL_PEER_CLOSED;
   return rv;
 }
 
 MojoResult MessagePipeDispatcher::AddAwakableImplNoLock(
     Awakable* awakable,
     MojoHandleSignals signals,
     uintptr_t context,
     HandleSignalsState* signals_state) {
   lock().AssertAcquired();
-  if (channel_) {
+  if (transferable_ && channel_) {
     channel_->EnsureLazyInitialized();
   } else if (!transferable_ &&
              non_transferable_state_ == WAITING_FOR_READ_OR_WRITE) {
     RequestNontransferableChannel();
   }
 
   HandleSignalsState state = GetHandleSignalsStateImplNoLock();
   if (state.satisfies(signals)) {
     if (signals_state)
       *signals_state = state;
@@ skipping 268 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