| Index: mojo/edk/system/node_controller.cc
|
| diff --git a/mojo/edk/system/node_controller.cc b/mojo/edk/system/node_controller.cc
|
| index 00164c05690a8856777dfc9d67e98ff1ab1268a4..54e7e3c443aa689bbe8845b1b5ea60730f4c5891 100644
|
| --- a/mojo/edk/system/node_controller.cc
|
| +++ b/mojo/edk/system/node_controller.cc
|
| @@ -980,10 +980,10 @@ void NodeController::AttemptShutdownIfRequested() {
|
| base::AutoLock lock(shutdown_lock_);
|
| if (shutdown_callback_.is_null())
|
| return;
|
| - if (!node_->CanShutdownCleanly(true /* allow_local_ports */)) {
|
| - DVLOG(2) << "Unable to cleanly shut down node " << name_ << ".";
|
| - return;
|
| - }
|
| +
|
| + // TODO(rockot): We should return here if clean shutdown of |node_| is not
|
| + // yet possible. See http://crbug.com/589864 for why we don't.
|
| +
|
| callback = shutdown_callback_;
|
| shutdown_callback_.Reset();
|
| }
|
|
|