[mojo-edk] Revert ObserveProxy retransmission behavior

mojo/edk/system/ports/node.cc

 // Copyright 2016 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/ports/node.h"
 
 #include <string.h>
 
 #include <utility>
 
@@ skipping 46 matching lines @@
 Node::Node(const NodeName& name, NodeDelegate* delegate)
     : name_(name),
       delegate_(delegate) {
 }
 
 Node::~Node() {
   if (!ports_.empty())
     DLOG(WARNING) << "Unclean shutdown for node " << name_;
 }
 
-bool Node::CanShutdownCleanly(bool allow_local_ports) {
+bool Node::CanShutdownCleanly(ShutdownPolicy policy) {
   base::AutoLock ports_lock(ports_lock_);
 
-  if (!allow_local_ports) {
+  if (policy == ShutdownPolicy::DONT_ALLOW_LOCAL_PORTS) {
 #if DCHECK_IS_ON()
     for (auto entry : ports_) {
       DVLOG(2) << "Port " << entry.first << " referencing node "
                << entry.second->peer_node_name << " is blocking shutdown of "
                << "node " << name_ << " (state=" << entry.second->state << ")";
     }
 #endif
     return ports_.empty();
   }
 
+  DCHECK_EQ(policy, ShutdownPolicy::ALLOW_LOCAL_PORTS);
+
   // NOTE: This is not efficient, though it probably doesn't need to be since
   // relatively few ports should be open during shutdown and shutdown doesn't
   // need to be blazingly fast.
   bool can_shutdown = true;
   for (auto entry : ports_) {
     base::AutoLock lock(entry.second->lock);
     if (entry.second->peer_node_name != name_ &&
         entry.second->state != Port::kReceiving) {
       can_shutdown = false;
 #if DCHECK_IS_ON()
@@ skipping 433 matching lines @@
     DestroyAllPortsWithPeer(event.proxy_node_name, event.proxy_port_name);
     return OK;
   }
 
   // The port may have already been closed locally, in which case the
   // ObserveClosure message will contain the last_sequence_num field.
   // We can then silently ignore this message.
   scoped_refptr<Port> port = GetPort(port_name);
   if (!port) {
     DVLOG(1) << "ObserveProxy: " << port_name << "@" << name_ << " not found";
-
-    if (port_name != event.proxy_port_name &&
-        port_name != event.proxy_to_port_name) {
-      // The receiving port may have been removed while this message was in
-      // transit.  In this case, we restart the ObserveProxy circulation from
-      // the referenced proxy port to avoid leaking the proxy.
-      delegate_->ForwardMessage(
-          event.proxy_node_name,
-          NewInternalMessage(
-              event.proxy_port_name, EventType::kObserveProxy, event));
-    }
     return OK;
   }
 
   DVLOG(2) << "ObserveProxy at " << port_name << "@" << name_ << ", proxy at "
            << event.proxy_port_name << "@"
            << event.proxy_node_name << " pointing to "
            << event.proxy_to_port_name << "@"
            << event.proxy_to_node_name;
 
   {
@@ skipping 830 matching lines @@
 
   if (num_data_bytes)
     memcpy(header + 1, data, num_data_bytes);
 
   return message;
 }
 
 }  // namespace ports
 }  // namespace edk
 }  // namespace mojo