Mojo: Make some attempts towards fixing remote message pipe closure.

mojo/system/remote_message_pipe_unittest.cc

 // Copyright 2014 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 <stdint.h>
 #include <string.h>
 
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 120 matching lines @@
     CHECK(channels_[1]->RunMessagePipeEndpoint(local_id1, local_id0));
   }
 
   void BootstrapMessagePipeOnIOThread(unsigned channel_index,
                                       scoped_refptr<MessagePipe> mp) {
     CHECK_EQ(base::MessageLoop::current(), io_thread()->message_loop());
     CHECK(channel_index == 0 || channel_index == 1);
 
     unsigned port = channel_index ^ 1u;
 
-    // Important: If we don't boot
     CreateAndInitChannel(channel_index);
-    CHECK_EQ(channels_[channel_index]->AttachMessagePipeEndpoint(mp, port),
-             Channel::kBootstrapEndpointId);
+    MessageInTransit::EndpointId endpoint_id =
+        channels_[channel_index]->AttachMessagePipeEndpoint(mp, port);
+    if (endpoint_id == MessageInTransit::kInvalidEndpointId) {
+      return;
+    }

[darin (slow to review), 2014/04/16 21:33:43]

nit: no brackets here for consistency in this file

[viettrungluu, 2014/04/16 22:25:01]

Done.

+
+    CHECK_EQ(endpoint_id, Channel::kBootstrapEndpointId);
     CHECK(channels_[channel_index]->RunMessagePipeEndpoint(
         Channel::kBootstrapEndpointId, Channel::kBootstrapEndpointId));
   }
 
   void RestoreInitialStateOnIOThread() {
     CHECK_EQ(base::MessageLoop::current(), io_thread()->message_loop());
 
     TearDownOnIOThread();
     SetUpOnIOThread();
   }
@@ skipping 399 matching lines @@
   local_mp->Close(1);
 }
 
 // Test racing closes (on each end).
 // Note: A flaky failure would almost certainly indicate a problem in the code
 // itself (not in the test). Also, any logged warnings/errors would also
 // probably be indicative of bugs.
 TEST_F(RemoteMessagePipeTest, RacingClosesStress) {
   base::TimeDelta delay = base::TimeDelta::FromMilliseconds(5);
 
-  for (unsigned i = 0u; i < 256u; i++) {
+  for (unsigned i = 0; i < 256; i++) {
+    DVLOG(2) << "---------------------------------------- " << i;
     scoped_refptr<MessagePipe> mp0(new MessagePipe(
         scoped_ptr<MessagePipeEndpoint>(new LocalMessagePipeEndpoint()),
         scoped_ptr<MessagePipeEndpoint>(new ProxyMessagePipeEndpoint())));
     BootstrapMessagePipeNoWait(0, mp0);
 
     scoped_refptr<MessagePipe> mp1(new MessagePipe(
         scoped_ptr<MessagePipeEndpoint>(new ProxyMessagePipeEndpoint()),
         scoped_ptr<MessagePipeEndpoint>(new LocalMessagePipeEndpoint())));
     BootstrapMessagePipeNoWait(1, mp1);
 
@@ skipping 15 matching lines @@
 
     mp1->Close(1);
 
     RestoreInitialState();
   }
 }
 
 }  // namespace
 }  // namespace system
 }  // namespace mojo