Update content module for IPC attachment brokering.

content/plugin/plugin_channel.cc

 // Copyright (c) 2012 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/plugin/plugin_channel.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/process/process_handle.h"
 #include "base/strings/string_util.h"
@@ skipping 122 matching lines @@
     int refcount;  // There could be multiple plugin instances per tab.
   };
   typedef std::map<int, WaitableEventWrapper> ModalDialogEventMap;
   ModalDialogEventMap modal_dialog_event_map_;
   base::Lock modal_dialog_event_map_lock_;
 
   IPC::Sender* sender_;
 };
 
 PluginChannel* PluginChannel::GetPluginChannel(
-    int renderer_id, base::SingleThreadTaskRunner* ipc_task_runner) {
+    int renderer_id,
+    base::SingleThreadTaskRunner* ipc_task_runner,
+    IPC::AttachmentBroker* broker) {
   // Map renderer ID to a (single) channel to that process.
   std::string channel_key = base::StringPrintf(
       "%d.r%d", base::GetCurrentProcId(), renderer_id);
 
   PluginChannel* channel =
       static_cast<PluginChannel*>(NPChannelBase::GetChannel(
-          channel_key,
-          IPC::Channel::MODE_SERVER,
-          ClassFactory,
-          ipc_task_runner,
-          false,
-          ChildProcess::current()->GetShutDownEvent()));
+          channel_key, IPC::Channel::MODE_SERVER, ClassFactory, ipc_task_runner,
+          false, ChildProcess::current()->GetShutDownEvent(), broker));
 
   if (channel)
     channel->renderer_id_ = renderer_id;
 
   return channel;
 }
 
 // static
 void PluginChannel::NotifyRenderersOfPendingShutdown() {
   Broadcast(new PluginHostMsg_PluginShuttingDown());
@@ skipping 55 matching lines @@
   while (!plugin_stubs_.empty()) {
     // Separate vector::erase and ~WebPluginDelegateStub.
     // See https://code.google.com/p/chromium/issues/detail?id=314088
     scoped_refptr<WebPluginDelegateStub> stub = plugin_stubs_[0];
     plugin_stubs_.erase(plugin_stubs_.begin());
   }
 }
 
 bool PluginChannel::Init(base::SingleThreadTaskRunner* ipc_task_runner,
                          bool create_pipe_now,
-                         base::WaitableEvent* shutdown_event) {
-  if (!NPChannelBase::Init(ipc_task_runner, create_pipe_now, shutdown_event))
+                         base::WaitableEvent* shutdown_event,
+                         IPC::AttachmentBroker* broker) {
+  if (!NPChannelBase::Init(ipc_task_runner, create_pipe_now, shutdown_event,
+                           broker)) {
     return false;
+  }
 
   channel_->AddFilter(filter_.get());
   return true;
 }
 
 PluginChannel::PluginChannel()
     : renderer_id_(-1),
       in_send_(0),
       incognito_(false),
       filter_(new MessageFilter()),
@@ skipping 94 matching lines @@
 void PluginChannel::OnDidAbortLoading(int render_view_id) {
   for (size_t i = 0; i < plugin_stubs_.size(); ++i) {
     if (plugin_stubs_[i]->webplugin()->host_render_view_routing_id() ==
             render_view_id) {
       plugin_stubs_[i]->delegate()->instance()->CloseStreams();
     }
   }
 }
 
 }  // namespace content