ipc: Use a global for the process's attachment broker.

content/child/npapi/np_channel_base.cc

Index: content/child/npapi/np_channel_base.cc
diff --git a/content/child/npapi/np_channel_base.cc b/content/child/npapi/np_channel_base.cc
index 341a3da14e1d55686ce312de94c6da56f6e749dc..c227c88c56f616599f5a69d92e4cc2e1697257a4 100644
--- a/content/child/npapi/np_channel_base.cc
+++ b/content/child/npapi/np_channel_base.cc
@@ -68,8 +68,7 @@ NPChannelBase* NPChannelBase::GetChannel(
     ChannelFactory factory,
     base::SingleThreadTaskRunner* ipc_task_runner,
     bool create_pipe_now,
-    base::WaitableEvent* shutdown_event,
-    IPC::AttachmentBroker* broker) {
+    base::WaitableEvent* shutdown_event) {
 #if defined(OS_POSIX)
   // On POSIX the channel_handle conveys an FD (socket) which is duped by the
   // kernel during the IPC message exchange (via the SCM_RIGHTS mechanism).
@@ -99,8 +98,7 @@ NPChannelBase* NPChannelBase::GetChannel(
           IPC::Channel::GenerateVerifiedChannelID(channel_key);
     }
     channel->mode_ = mode;
-    if (channel->Init(ipc_task_runner, create_pipe_now, shutdown_event,
-                      broker)) {
+    if (channel->Init(ipc_task_runner, create_pipe_now, shutdown_event)) {
       (*GetChannelMap())[channel_key] = channel;
     } else {
       channel = NULL;
@@ -176,8 +174,7 @@ base::WaitableEvent* NPChannelBase::GetModalDialogEvent(int render_view_id) {
 
 bool NPChannelBase::Init(base::SingleThreadTaskRunner* ipc_task_runner,
                          bool create_pipe_now,
-                         base::WaitableEvent* shutdown_event,
-                         IPC::AttachmentBroker* broker) {
+                         base::WaitableEvent* shutdown_event) {
 #if defined(OS_POSIX)
   // Attempting to initialize with an invalid channel handle.
   // See http://crbug.com/97285 for details.
@@ -187,7 +184,7 @@ bool NPChannelBase::Init(base::SingleThreadTaskRunner* ipc_task_runner,
 
   channel_ =
       IPC::SyncChannel::Create(channel_handle_, mode_, this, ipc_task_runner,
-                               create_pipe_now, shutdown_event, broker);
+                               create_pipe_now, shutdown_event);
 
 #if defined(OS_POSIX)
   // Check the validity of fd for bug investigation.  Remove after fixed.