Last set of fixes to make the src/mojo/edk pass the page cycler.

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 13 matching lines @@
 
 void DataPipeConsumerDispatcher::Init(
     ScopedPlatformHandle message_pipe,
     char* serialized_read_buffer, size_t serialized_read_buffer_size) {
   if (message_pipe.is_valid()) {
     channel_ = RawChannel::Create(message_pipe.Pass());
     channel_->SetSerializedData(
         serialized_read_buffer, serialized_read_buffer_size, nullptr, 0u);
     internal::g_io_thread_task_runner->PostTask(
         FROM_HERE, base::Bind(&DataPipeConsumerDispatcher::InitOnIO, this));
+  } else {
+    // The data pipe consumer could have read all the data and the producer
+    // closed its end subsequently (before the consumer was sent). In that case
+    // when we deserialize the consumer we must make sure to set error_ or
+    // otherwise the peer-closed signal will never be satisfied.
+    error_ = true;
   }
 }
 
 void DataPipeConsumerDispatcher::InitOnIO() {
   base::AutoLock locker(lock());
   calling_init_ = true;
   if (channel_)
     channel_->Init(this);
   calling_init_ = false;
 }
@@ skipping 41 matching lines @@
       buffer += header->data_size;
     }
 
     if (header->read_buffer_size) {
       serialized_read_buffer = buffer;
       serialized_read_buffer_size = header->read_buffer_size;
       buffer += header->read_buffer_size;
     }
   }
 
-  if (platform_handle.is_valid()) {
-    rv->Init(platform_handle.Pass(), serialized_read_buffer,
-             serialized_read_buffer_size);
-  } else {
-    // The data pipe consumer could have read all the data and the producer
-    // closed its end subsequently (before the consumer was sent). In that case
-    // when we deserialize the consumer we must make sure to set error_ or
-    // otherwise the peer-closed signal will never be satisfied.
-    rv->error_ = true;
-  }
+  rv->Init(platform_handle.Pass(), serialized_read_buffer,
+           serialized_read_buffer_size);
   return rv;
 }
 
 DataPipeConsumerDispatcher::DataPipeConsumerDispatcher(
     const MojoCreateDataPipeOptions& options)
     : options_(options),
       channel_(nullptr),
       calling_init_(false),
       in_two_phase_read_(false),
       two_phase_max_bytes_read_(0),
@@ skipping 331 matching lines @@
       LOG(ERROR) << "DataPipeConsumerDispatcher read error (unknown)";
       break;
     case ERROR_WRITE:
       LOG(ERROR) << "DataPipeConsumerDispatcher shouldn't write messages";
       break;
   }
 
   error_ = true;
   if (started_transport_.Try()) {
     base::AutoLock locker(lock());
+    // We can get two OnError callbacks before the post task below completes.
+    // Although RawChannel still has a pointer to this object until Shutdown is
+    // called, that is safe since this class always does a PostTask to the IO
+    // thread to self destruct.
+    if (!channel_)
+      return;
+
     awakable_list_.AwakeForStateChange(GetHandleSignalsStateImplNoLock());
     started_transport_.Release();
 
     base::MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(&RawChannel::Shutdown, base::Unretained(channel_)));
     channel_ = nullptr;
   } else {
     // We must be waiting to call ReleaseHandle. It will call Shutdown.
   }
@@ skipping 11 matching lines @@
     CHECK(serialized_write_buffer.empty());
 
     channel_ = nullptr;
   }
 
   serialized_ = true;
 }
 
 }  // namespace edk
 }  // namespace mojo