Use ChannelMojo between app shims and the browser process.

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 253af8763d1dee55ad30de36c095fe095ec2fa90..9f957e762ece8b5ef8dad20c23c0c88742921ed7 100644
--- a/mojo/edk/system/node_controller.cc
+++ b/mojo/edk/system/node_controller.cc
@@ -1269,9 +1269,11 @@ void NodeController::OnAcceptPeer(const ports::NodeName& from_node,
   pending_peers_.erase(it);
   DCHECK(channel);
 
-  DVLOG(1) << "Node " << name_ << " accepted peer " << peer_name;
+  if (name_ != peer_name) {

[Ken Rockot(use gerrit already), 2016/09/01 23:43:34]

nit: I was originally a bit confused about why this change was made. Maybe
comment that it's to support in-process use of the peer connection API?

[Sam McNally, 2016/09/02 00:13:24]

Done.

+    DVLOG(1) << "Node " << name_ << " accepted peer " << peer_name;
 
-  AddPeer(peer_name, channel, false /* start_channel */);
+    AddPeer(peer_name, channel, false /* start_channel */);
+  }
 
   // We need to choose one side to initiate the port merge. It doesn't matter
   // who does it as long as they don't both try. Simple solution: pick the one