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

content/child/npapi/np_channel_base.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/child/npapi/np_channel_base.h"
 
 #include "base/auto_reset.h"
 #include "base/containers/hash_tables.h"
 #include "base/files/scoped_file.h"
 #include "base/lazy_instance.h"
@@ skipping 50 matching lines @@
 }
 
 }  // namespace
 
 NPChannelBase* NPChannelBase::GetChannel(
     const IPC::ChannelHandle& channel_handle,
     IPC::Channel::Mode mode,
     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).
   // Ensure we do not leak this FD.
   base::ScopedFD fd(channel_handle.socket.auto_close ?
                     channel_handle.socket.fd : -1);
 #endif
 
   scoped_refptr<NPChannelBase> channel;
   std::string channel_key = channel_handle.name;
   ChannelMap::const_iterator iter = GetChannelMap()->find(channel_key);
   if (iter == GetChannelMap()->end()) {
     channel = factory();
   } else {
     channel = iter->second;
   }
 
   DCHECK(channel.get() != NULL);
 
   if (!channel->channel_valid()) {
     channel->channel_handle_ = channel_handle;
 #if defined(OS_POSIX)
     ignore_result(fd.release());
 #endif
     if (mode & IPC::Channel::MODE_SERVER_FLAG) {
       channel->channel_handle_.name =
           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;
     }
   }
 
   return channel.get();
 }
 
 void NPChannelBase::Broadcast(IPC::Message* message) {
@@ skipping 55 matching lines @@
   }
   return iter->second;
 }
 
 base::WaitableEvent* NPChannelBase::GetModalDialogEvent(int render_view_id) {
   return NULL;
 }
 
 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.
   if (mode_ == IPC::Channel::MODE_CLIENT && -1 == channel_handle_.socket.fd)
     return false;
 #endif
 
   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.
   // See crbug.com/97285 for details.
   if (mode_ == IPC::Channel::MODE_SERVER)
     CHECK_NE(-1, channel_->GetClientFileDescriptor());
 #endif
 
   channel_valid_ = true;
   return true;
@@ skipping 183 matching lines @@
   RouteToOwnerMap::iterator iter = route_to_owner_.find(route_id);
   return iter != route_to_owner_.end() ? iter->second : default_owner_;
 }
 
 int NPChannelBase::GetExistingRouteForNPObjectOwner(NPP owner) {
   OwnerToRouteMap::iterator iter = owner_to_route_.find(owner);
   return iter != owner_to_route_.end() ? iter->second : MSG_ROUTING_NONE;
 }
 
 }  // namespace content