[mojo] Remove an unnecessary hack to avoid a race am: e13d667983 am: dff0a3ca9f am: 62201b13e8
am: 0a6947d947
Change-Id: I1ec74af2d632f45752b5dc90cea12cd368905a45
diff --git a/mojo/edk/system/node_controller.cc b/mojo/edk/system/node_controller.cc
index 91599d8..63291a5 100644
--- a/mojo/edk/system/node_controller.cc
+++ b/mojo/edk/system/node_controller.cc
@@ -647,23 +647,6 @@
DVLOG(1) << "Dropping message for unknown peer: " << name;
return;
}
-
- // HACK: On ARC++ we never really need this codepath since it is always hit
- // when RemoteMessagePipeBootstrap races against us in delivering the
- // three-way broker handshake. If we do send the RequestIntroduction message,
- // the broker (Chrome) won't yet know our peer, and it will cause us to drop
- // that peer's connection, causing it to go in loops requesting for a
- // re-introduction. Instead, let's assume that the node will eventually be
- // introduced to us and just stick it in the queue. Note that this is only
- // safe since ARC++ processes strictly follow a star topology, and we never
- // pass handles between children.
- //
- // We need to revert this eventually when a long-term fix is ready. See
- // b/33453258 for more details.
- LOG(ERROR) << "Averted b/33453258 by dropping the introduction request for "
- << name;
- return;
-
broker->RequestIntroduction(name);
}
}
