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

mojo/system/proxy_message_pipe_endpoint.h

 // 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.
 
 #ifndef MOJO_SYSTEM_PROXY_MESSAGE_PIPE_ENDPOINT_H_
 #define MOJO_SYSTEM_PROXY_MESSAGE_PIPE_ENDPOINT_H_
 
 #include <stdint.h>
 
 #include "base/compiler_specific.h"
@@ skipping 35 matching lines @@
   // |LocalMessagePipeEndpoint| (which this constructor will close), taking its
   // message queue's contents. This is done when transferring a message pipe
   // handle over a remote message pipe.
   ProxyMessagePipeEndpoint(
       LocalMessagePipeEndpoint* local_message_pipe_endpoint,
       bool is_peer_open);
   virtual ~ProxyMessagePipeEndpoint();
 
   // |MessagePipeEndpoint| implementation:
   virtual Type GetType() const OVERRIDE;
-  virtual void Close() OVERRIDE;
-  virtual void OnPeerClose() OVERRIDE;
+  virtual bool OnPeerClose() OVERRIDE;
   virtual void EnqueueMessage(scoped_ptr<MessageInTransit> message) OVERRIDE;
   virtual void Attach(scoped_refptr<Channel> channel,
                       MessageInTransit::EndpointId local_id) OVERRIDE;
-  virtual void Run(MessageInTransit::EndpointId remote_id) OVERRIDE;
+  virtual bool Run(MessageInTransit::EndpointId remote_id) OVERRIDE;
+  virtual void OnRemove() OVERRIDE;
 
  private:
+  void Detach();
+
+#ifdef NDEBUG
+  void AssertConsistentState() const {}
+#else
+  void AssertConsistentState() const;
+#endif
+
   bool is_attached() const {
     return !!channel_.get();
   }
 
   bool is_running() const {
     return remote_id_ != MessageInTransit::kInvalidEndpointId;
   }
 
-#ifdef NDEBUG
-  void AssertConsistentState() const {}
-#else
-  void AssertConsistentState() const;
-#endif
-
   // This should only be set if we're attached.
   scoped_refptr<Channel> channel_;
 
   // |local_id_| should be set to something other than
   // |MessageInTransit::kInvalidEndpointId| when we're attached.
   MessageInTransit::EndpointId local_id_;
 
   // |remote_id_| being set to anything other than
   // |MessageInTransit::kInvalidEndpointId| indicates that we're "running",
   // i.e., actively able to send messages. We should only ever be running if
   // we're attached.
   MessageInTransit::EndpointId remote_id_;
 
-  bool is_open_;
   bool is_peer_open_;
 
   // This queue is only used while we're detached, to store messages while we're
   // not ready to send them yet.
   MessageInTransitQueue paused_message_queue_;
 
   DISALLOW_COPY_AND_ASSIGN(ProxyMessagePipeEndpoint);
 };
 
 }  // namespace system
 }  // namespace mojo
 
 #endif  // MOJO_SYSTEM_PROXY_MESSAGE_PIPE_ENDPOINT_H_