Fix shutdown assert in new Mojo EDK.

mojo/edk/system/data_pipe_consumer_dispatcher.cc

 // Copyright 2013 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/data_pipe_consumer_dispatcher.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 98 matching lines @@
     : options_(options),
       channel_(nullptr),
       calling_init_(false),
       in_two_phase_read_(false),
       two_phase_max_bytes_read_(0),
       error_(false),
       serialized_(false) {
 }
 
 DataPipeConsumerDispatcher::~DataPipeConsumerDispatcher() {
-  // |Close()|/|CloseImplNoLock()| should have taken care of the channel.
-  DCHECK(!channel_);
+  // See comment in ~MessagePipeDispatcher.
+  if (channel_ && internal::g_io_thread_task_runner->RunsTasksOnCurrentThread())
+    channel_->Shutdown();
+  else
+    DCHECK(!channel_);
 }
 
 void DataPipeConsumerDispatcher::CancelAllAwakablesNoLock() {
   lock().AssertAcquired();
   awakable_list_.CancelAll();
 }
 
 void DataPipeConsumerDispatcher::CloseImplNoLock() {
   lock().AssertAcquired();
   internal::g_io_thread_task_runner->PostTask(
@@ skipping 358 matching lines @@
     CHECK(!write_error) << "DataPipeConsumerDispatcher doesn't write.";
 
     channel_ = nullptr;
   }
 
   serialized_ = true;
 }
 
 }  // namespace edk
 }  // namespace mojo