Remove attachment brokering from non-NaCl child processes.

components/nacl/broker/nacl_broker_listener.cc

Index: components/nacl/broker/nacl_broker_listener.cc
diff --git a/components/nacl/broker/nacl_broker_listener.cc b/components/nacl/broker/nacl_broker_listener.cc
index 69a58fd8ddfdc568e110c1009d7d361ad78200a3..3a7a06b005106351006c9715348503b5587e5cee 100644
--- a/components/nacl/broker/nacl_broker_listener.cc
+++ b/components/nacl/broker/nacl_broker_listener.cc
@@ -22,7 +22,6 @@
 #include "content/public/common/content_switches.h"
 #include "content/public/common/mojo_channel_switches.h"
 #include "content/public/common/sandbox_init.h"
-#include "ipc/attachment_broker_unprivileged.h"
 #include "ipc/ipc_channel.h"
 #include "ipc/ipc_switches.h"
 #include "mojo/edk/embedder/embedder.h"
@@ -39,13 +38,9 @@ void SendReply(IPC::Channel* channel, int32_t pid, bool result) {
 }  // namespace
 
 NaClBrokerListener::NaClBrokerListener() {
-  IPC::AttachmentBrokerUnprivileged::CreateBrokerIfNeeded();
 }
 
 NaClBrokerListener::~NaClBrokerListener() {
-  IPC::AttachmentBroker* broker = IPC::AttachmentBroker::GetGlobal();
-  if (broker && !broker->IsPrivilegedBroker() && channel_)
-    broker->DeregisterBrokerCommunicationChannel(channel_.get());
 }
 
 void NaClBrokerListener::Listen() {
@@ -57,9 +52,6 @@ void NaClBrokerListener::Listen() {
   IPC::ChannelHandle channel_handle(handle.release());
 
   channel_ = IPC::Channel::CreateClient(channel_handle, this);
-  IPC::AttachmentBroker* broker = IPC::AttachmentBroker::GetGlobal();
-  if (broker && !broker->IsPrivilegedBroker())
-    broker->RegisterBrokerCommunicationChannel(channel_.get());
   CHECK(channel_->Connect());
   base::MessageLoop::current()->Run();
 }