IPC: Make ChannelReader inherit from SupportsAttachmentBrokering.

ipc/ipc_channel_win.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 "ipc/ipc_channel_win.h"
 
 #include <windows.h>
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
@@ skipping 16 matching lines @@
   memset(&context.overlapped, 0, sizeof(context.overlapped));
   context.handler = channel;
 }
 
 ChannelWin::State::~State() {
   static_assert(offsetof(ChannelWin::State, context) == 0,
                 "ChannelWin::State should have context as its first data"
                 "member.");
 }
 
-ChannelWin::ChannelWin(const IPC::ChannelHandle &channel_handle,
-                       Mode mode, Listener* listener)
+ChannelWin::ChannelWin(const IPC::ChannelHandle& channel_handle,
+                       Mode mode,
+                       Listener* listener,
+                       AttachmentBroker* broker)
     : ChannelReader(listener),
       input_state_(this),
       output_state_(this),
       peer_pid_(base::kNullProcessId),
       waiting_connect_(mode & MODE_SERVER_FLAG),
       processing_incoming_(false),
       validate_client_(false),
       client_secret_(0),
-      weak_factory_(this) {
+      weak_factory_(this),
+      broker_(broker) {
   CreatePipe(channel_handle, mode);
 }
 
 ChannelWin::~ChannelWin() {
   Close();
 }
 
 void ChannelWin::Close() {
   if (thread_check_.get())
     DCHECK(thread_check_->CalledOnValidThread());
@@ skipping 36 matching lines @@
   if (!waiting_connect_) {
     if (!output_state_.is_pending) {
       if (!ProcessOutgoingMessages(NULL, 0))
         return false;
     }
   }
 
   return true;
 }
 
+AttachmentBroker* ChannelWin::GetAttachmentBroker() {
+  return broker_;
+}
+
 base::ProcessId ChannelWin::GetPeerPID() const {
   return peer_pid_;
 }
 
 base::ProcessId ChannelWin::GetSelfPID() const {
   return GetCurrentProcessId();
 }
 
 // static
 bool ChannelWin::IsNamedServerInitialized(
@@ skipping 355 matching lines @@
     // We don't want to re-enter Close().
     Close();
     listener()->OnChannelError();
   }
 }
 
 //------------------------------------------------------------------------------
 // Channel's methods
 
 // static
-scoped_ptr<Channel> Channel::Create(
-    const IPC::ChannelHandle &channel_handle, Mode mode, Listener* listener) {
+scoped_ptr<Channel> Channel::Create(const IPC::ChannelHandle& channel_handle,
+                                    Mode mode,
+                                    Listener* listener,
+                                    AttachmentBroker* broker) {
   return scoped_ptr<Channel>(
-      new ChannelWin(channel_handle, mode, listener));
+      new ChannelWin(channel_handle, mode, listener, broker));
 }
 
 // static
 bool Channel::IsNamedServerInitialized(const std::string& channel_id) {
   return ChannelWin::IsNamedServerInitialized(channel_id);
 }
 
 // static
 std::string Channel::GenerateVerifiedChannelID(const std::string& prefix) {
   // Windows pipes can be enumerated by low-privileged processes. So, we
   // append a strong random value after the \ character. This value is not
   // included in the pipe name, but sent as part of the client hello, to
   // hijacking the pipe name to spoof the client.
 
   std::string id = prefix;
   if (!id.empty())
     id.append(".");
 
   int secret;
   do {  // Guarantee we get a non-zero value.
     secret = base::RandInt(0, std::numeric_limits<int>::max());
   } while (secret == 0);
 
   id.append(GenerateUniqueRandomChannelID());
   return id.append(base::StringPrintf("\\%d", secret));
 }
 
 }  // namespace IPC