[mojo-edk] Revert port reservation timeout behavior

mojo/edk/system/node_controller.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/node_controller.h"
 
 #include <algorithm>
 #include <limits>
 
 #include "base/bind.h"
@@ skipping 172 matching lines @@
 }
 
 void NodeController::ReservePort(const std::string& token,
                                  const ports::PortRef& port) {
   DVLOG(2) << "Reserving port " << port.name() << "@" << name_ << " for token "
            << token;
 
   base::AutoLock lock(reserved_ports_lock_);
   auto result = reserved_ports_.insert(std::make_pair(token, port));
   DCHECK(result.second);
-
-  // Safeguard against unpredictable and exceptional cases where a reservation
-  // holder may disappear without ever claiming their reservation.
-  io_task_runner_->PostDelayedTask(
-      FROM_HERE,
-      base::Bind(&NodeController::CancelReservation,
-                 base::Unretained(this), token),
-      base::TimeDelta::FromMinutes(1));
 }
 
 void NodeController::MergePortIntoParent(const std::string& token,
                                          const ports::PortRef& port) {
   bool was_merged = false;
   {
     // This request may be coming from within the process that reserved the
     // "parent" side (e.g. for Chrome single-process mode), so if this token is
     // reserved locally, merge locally instead.
     base::AutoLock lock(reserved_ports_lock_);
@@ skipping 329 matching lines @@
     pending_peer_messages_.clear();
   }
 
   for (const auto& peer : all_peers)
     peer->ShutDown();
 
   if (destroy_on_io_thread_shutdown_)
     delete this;
 }
 
-void NodeController::CancelReservation(const std::string& token) {
-  ports::PortRef reserved_port;
-  {
-    base::AutoLock lock(reserved_ports_lock_);
-    auto iter = reserved_ports_.find(token);
-    if (iter == reserved_ports_.end())  // Already claimed!
-      return;
-    reserved_port = iter->second;
-    reserved_ports_.erase(iter);
-  }
-  node_->ClosePort(reserved_port);
-}
-
 void NodeController::GenerateRandomPortName(ports::PortName* port_name) {
   GenerateRandomName(port_name);
 }
 
 void NodeController::AllocMessage(size_t num_header_bytes,
                                   ports::ScopedMessage* message) {
   message->reset(new PortsMessage(num_header_bytes, 0, 0, nullptr));
 }
 
 void NodeController::ForwardMessage(const ports::NodeName& node,
@@ skipping 457 matching lines @@
     shutdown_callback_flag_.Set(false);
   }
 
   DCHECK(!callback.is_null());
 
   callback.Run();
 }
 
 }  // namespace edk
 }  // namespace mojo