Fix assumption in mojo binding class Connector that message pipes notice the other end's closing sy…

mojo/public/cpp/bindings/lib/connector.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/public/cpp/bindings/lib/connector.h"
 
 #include <stdint.h>
 #include <utility>
 
 #include "base/logging.h"
@@ skipping 246 matching lines @@
 
 void Connector::ReadAllAvailableMessages() {
   while (!error_) {
     MojoResult rv;
 
     // Return immediately if |this| was destroyed. Do not touch any members!
     if (!ReadSingleMessage(&rv))
       return;
 
     if (rv == MOJO_RESULT_SHOULD_WAIT) {
-      WaitToReadMore();
+      // ReadSingleMessage could end up calling HandleError which resets
+      // message_pipe_ to a dummy one that is closed. The old EDK will see the
+      // that the peer is closed immediately, while the new one is asynchronous
+      // because of thread hops. In that case, there'll still be an async
+      // waiter.
+      if (!async_wait_id_)
+        WaitToReadMore();
       break;
     }
   }
 }
 
 void Connector::CancelWait() {
   if (!async_wait_id_)
     return;
 
   waiter_->CancelWait(async_wait_id_);
@@ skipping 30 matching lines @@
     if (!paused_)
       WaitToReadMore();
   } else {
     error_ = true;
     connection_error_handler_.Run();
   }
 }
 
 }  // namespace internal
 }  // namespace mojo