Reland: Bootstrap Mojo IPC independent of Chrome IPC

mojo/edk/system/node_controller.cc

Index: mojo/edk/system/node_controller.cc
diff --git a/mojo/edk/system/node_controller.cc b/mojo/edk/system/node_controller.cc
index e2b1b08f5f307c6846f1e84a8af7c92b6de355b5..5b2fea82cb9738890071ddddef7808eaf8acaa12 100644
--- a/mojo/edk/system/node_controller.cc
+++ b/mojo/edk/system/node_controller.cc
@@ -180,6 +180,19 @@ void NodeController::ReservePort(const std::string& token,
 
 void NodeController::MergePortIntoParent(const std::string& token,
                                          const ports::PortRef& port) {
+  {
+    // 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_);
+    auto it = reserved_ports_.find(token);
+    if (it != reserved_ports_.end()) {
+      node_->MergePorts(port, name_, it->second.name());
+      reserved_ports_.erase(it);
+      return;
+    }
+  }
+
   scoped_refptr<NodeChannel> parent = GetParentChannel();
   if (parent) {
     parent->RequestPortMerge(port.name(), token);