IPC: Make ChannelReader inherit from SupportsAttachmentBrokering.

Each IPC::Channel will have a reference to an AttachmentBroker. This is
accomplished by requiring each of the Channel::Create methods to have a
|broker| parameter. For now, the |broker| parameter has a default value of
nullptr. This default parameter only exists so that this CL and subsequent
refactors can be decomposed into smaller CLs. The default parameter will be
removed once all callers of Channel::Create have been updated to pass in an
appropriate broker.

BUG=493414

Review URL: https://codereview.chromium.org/1185133006

Cr-Commit-Position: refs/heads/master@{#334699}

1 files changed, 6 insertions, 6 deletions

diff --git a/ipc/ipc_sync_channel_unittest.cc b/ipc/ipc_sync_channel_unittest.cc
index 7e81d5d..1e61a68 100644
--- a/ipc/ipc_sync_channel_unittest.cc
+++ b/ipc/ipc_sync_channel_unittest.cc
@@ -155,7 +155,7 @@ class Worker : public Listener, public Sender {
   virtual SyncChannel* CreateChannel() {
     scoped_ptr<SyncChannel> channel = SyncChannel::Create(
         channel_name_, mode_, this, ipc_thread_.task_runner().get(), true,
-        &shutdown_event_);
+        &shutdown_event_, nullptr);
     return channel.release();
   }
 
@@ -327,7 +327,7 @@ class TwoStepServer : public Worker {
     SyncChannel* channel =
         SyncChannel::Create(channel_name(), mode(), this,
                             ipc_thread().task_runner().get(), create_pipe_now_,
-                            shutdown_event()).release();
+                            shutdown_event(), nullptr).release();
     return channel;
   }
 
@@ -349,7 +349,7 @@ class TwoStepClient : public Worker {
     SyncChannel* channel =
         SyncChannel::Create(channel_name(), mode(), this,
                             ipc_thread().task_runner().get(), create_pipe_now_,
-                            shutdown_event()).release();
+                            shutdown_event(), nullptr).release();
     return channel;
   }
 
@@ -1138,7 +1138,7 @@ class RestrictedDispatchClient : public Worker {
 
     non_restricted_channel_ = SyncChannel::Create(
         "non_restricted_channel", IPC::Channel::MODE_CLIENT, this,
-        ipc_thread().task_runner().get(), true, shutdown_event());
+        ipc_thread().task_runner().get(), true, shutdown_event(), nullptr);
 
     server_->ListenerThread()->task_runner()->PostTask(
         FROM_HERE, base::Bind(&RestrictedDispatchServer::OnDoPing, server_, 2));
@@ -1525,7 +1525,7 @@ class RestrictedDispatchPipeWorker : public Worker {
     event2_->Wait();
     other_channel_ = SyncChannel::Create(
         other_channel_name_, IPC::Channel::MODE_CLIENT, this,
-        ipc_thread().task_runner().get(), true, shutdown_event());
+        ipc_thread().task_runner().get(), true, shutdown_event(), nullptr);
     other_channel_->SetRestrictDispatchChannelGroup(group_);
     if (!is_first()) {
       event1_->Signal();
@@ -1601,7 +1601,7 @@ class ReentrantReplyServer1 : public Worker {
   void Run() override {
     server2_channel_ = SyncChannel::Create(
         "reentrant_reply2", IPC::Channel::MODE_CLIENT, this,
-        ipc_thread().task_runner().get(), true, shutdown_event());
+        ipc_thread().task_runner().get(), true, shutdown_event(), nullptr);
     server_ready_->Signal();
     Message* msg = new SyncChannelTestMsg_Reentrant1();
     server2_channel_->Send(msg);