ipc: Remove unnecessary attachment broker plumbing.

ipc/mojo/ipc_channel_mojo.cc

 // Copyright 2014 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/mojo/ipc_channel_mojo.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/lazy_instance.h"
 #include "base/thread_task_runner_handle.h"
@@ skipping 12 matching lines @@
 #endif
 
 namespace IPC {
 
 namespace {
 
 class MojoChannelFactory : public ChannelFactory {
  public:
   MojoChannelFactory(scoped_refptr<base::TaskRunner> io_runner,
                      ChannelHandle channel_handle,
-                     Channel::Mode mode,
-                     AttachmentBroker* broker)
-      : io_runner_(io_runner),
-        channel_handle_(channel_handle),
-        mode_(mode),
-        broker_(broker) {}
+                     Channel::Mode mode)
+      : io_runner_(io_runner), channel_handle_(channel_handle), mode_(mode) {}
 
   std::string GetName() const override {
     return channel_handle_.name;
   }
 
   scoped_ptr<Channel> BuildChannel(Listener* listener) override {
-    return ChannelMojo::Create(io_runner_, channel_handle_, mode_, listener,
-                               broker_);
+    return ChannelMojo::Create(io_runner_, channel_handle_, mode_, listener);
   }
 
  private:
   scoped_refptr<base::TaskRunner> io_runner_;
   ChannelHandle channel_handle_;
   Channel::Mode mode_;
-  AttachmentBroker* broker_;
 };
 
 //------------------------------------------------------------------------------
 
 class ClientChannelMojo : public ChannelMojo, public ClientChannel {
  public:
   ClientChannelMojo(scoped_refptr<base::TaskRunner> io_runner,
                     const ChannelHandle& handle,
-                    Listener* listener,
-                    AttachmentBroker* broker);
+                    Listener* listener);
   ~ClientChannelMojo() override;
   // MojoBootstrap::Delegate implementation
   void OnPipeAvailable(mojo::embedder::ScopedPlatformHandle handle) override;
 
   // ClientChannel implementation
   void Init(
       mojo::ScopedMessagePipeHandle pipe,
       int32_t peer_pid,
       const mojo::Callback<void(int32_t)>& callback) override;
 
  private:
   void BindPipe(mojo::ScopedMessagePipeHandle handle);
   void OnConnectionError();
 
   mojo::Binding<ClientChannel> binding_;
   base::WeakPtrFactory<ClientChannelMojo> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ClientChannelMojo);
 };
 
 ClientChannelMojo::ClientChannelMojo(scoped_refptr<base::TaskRunner> io_runner,
                                      const ChannelHandle& handle,
-                                     Listener* listener,
-                                     AttachmentBroker* broker)
-    : ChannelMojo(io_runner, handle, Channel::MODE_CLIENT, listener, broker),
+                                     Listener* listener)
+    : ChannelMojo(io_runner, handle, Channel::MODE_CLIENT, listener),
       binding_(this),
-      weak_factory_(this) {
-}
+      weak_factory_(this) {}
 
 ClientChannelMojo::~ClientChannelMojo() {
 }
 
 void ClientChannelMojo::OnPipeAvailable(
     mojo::embedder::ScopedPlatformHandle handle) {
   CreateMessagingPipe(handle.Pass(), base::Bind(&ClientChannelMojo::BindPipe,
                                                 weak_factory_.GetWeakPtr()));
 }
 
@@ skipping 12 matching lines @@
 void ClientChannelMojo::OnConnectionError() {
   listener()->OnChannelError();
 }
 
 //------------------------------------------------------------------------------
 
 class ServerChannelMojo : public ChannelMojo {
  public:
   ServerChannelMojo(scoped_refptr<base::TaskRunner> io_runner,
                     const ChannelHandle& handle,
-                    Listener* listener,
-                    AttachmentBroker* broker);
+                    Listener* listener);
   ~ServerChannelMojo() override;
 
   // MojoBootstrap::Delegate implementation
   void OnPipeAvailable(mojo::embedder::ScopedPlatformHandle handle) override;
   // Channel override
   void Close() override;
 
  private:
   void InitClientChannel(mojo::ScopedMessagePipeHandle peer_handle,
                          mojo::ScopedMessagePipeHandle handle);
   void OnConnectionError();
 
   // ClientChannelClient implementation
   void ClientChannelWasInitialized(int32_t peer_pid);
 
   mojo::InterfacePtr<ClientChannel> client_channel_;
   mojo::ScopedMessagePipeHandle message_pipe_;
   base::WeakPtrFactory<ServerChannelMojo> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ServerChannelMojo);
 };
 
 ServerChannelMojo::ServerChannelMojo(scoped_refptr<base::TaskRunner> io_runner,
                                      const ChannelHandle& handle,
-                                     Listener* listener,
-                                     AttachmentBroker* broker)
-    : ChannelMojo(io_runner, handle, Channel::MODE_SERVER, listener, broker),
-      weak_factory_(this) {
-}
+                                     Listener* listener)
+    : ChannelMojo(io_runner, handle, Channel::MODE_SERVER, listener),
+      weak_factory_(this) {}
 
 ServerChannelMojo::~ServerChannelMojo() {
   Close();
 }
 
 void ServerChannelMojo::OnPipeAvailable(
     mojo::embedder::ScopedPlatformHandle handle) {
   mojo::ScopedMessagePipeHandle peer;
   MojoResult create_result =
       mojo::CreateMessagePipe(nullptr, &message_pipe_, &peer);
@@ skipping 73 matching lines @@
   // TODO(rockot): Investigate performance bottlenecks and hopefully reenable
   // this at some point. http://crbug.com/500019
   return false;
 }
 
 // static
 scoped_ptr<ChannelMojo> ChannelMojo::Create(
     scoped_refptr<base::TaskRunner> io_runner,
     const ChannelHandle& channel_handle,
     Mode mode,
-    Listener* listener,
-    AttachmentBroker* broker) {
+    Listener* listener) {
   switch (mode) {
     case Channel::MODE_CLIENT:
       return make_scoped_ptr(
-          new ClientChannelMojo(io_runner, channel_handle, listener, broker));
+          new ClientChannelMojo(io_runner, channel_handle, listener));
     case Channel::MODE_SERVER:
       return make_scoped_ptr(
-          new ServerChannelMojo(io_runner, channel_handle, listener, broker));
+          new ServerChannelMojo(io_runner, channel_handle, listener));
     default:
       NOTREACHED();
       return nullptr;
   }
 }
 
 // static
 scoped_ptr<ChannelFactory> ChannelMojo::CreateServerFactory(
     scoped_refptr<base::TaskRunner> io_runner,
-    const ChannelHandle& channel_handle,
-    AttachmentBroker* broker) {
-  return make_scoped_ptr(new MojoChannelFactory(io_runner, channel_handle,
-                                                Channel::MODE_SERVER, broker));
+    const ChannelHandle& channel_handle) {
+  return make_scoped_ptr(
+      new MojoChannelFactory(io_runner, channel_handle, Channel::MODE_SERVER));
 }
 
 // static
 scoped_ptr<ChannelFactory> ChannelMojo::CreateClientFactory(
     scoped_refptr<base::TaskRunner> io_runner,
-    const ChannelHandle& channel_handle,
-    AttachmentBroker* broker) {
-  return make_scoped_ptr(new MojoChannelFactory(io_runner, channel_handle,
-                                                Channel::MODE_CLIENT, broker));
+    const ChannelHandle& channel_handle) {
+  return make_scoped_ptr(
+      new MojoChannelFactory(io_runner, channel_handle, Channel::MODE_CLIENT));
 }
 
 ChannelMojo::ChannelMojo(scoped_refptr<base::TaskRunner> io_runner,
                          const ChannelHandle& handle,
                          Mode mode,
-                         Listener* listener,
-                         AttachmentBroker* broker)
+                         Listener* listener)
     : listener_(listener),
       peer_pid_(base::kNullProcessId),
       io_runner_(io_runner),
       channel_info_(nullptr, ChannelInfoDeleter(nullptr)),
       waiting_connect_(true),
       weak_factory_(this) {
   // Create MojoBootstrap after all members are set as it touches
   // ChannelMojo from a different thread.
-  bootstrap_ = MojoBootstrap::Create(handle, mode, this, broker);
+  bootstrap_ = MojoBootstrap::Create(handle, mode, this);
   if (io_runner == base::MessageLoop::current()->task_runner()) {
     InitOnIOThread();
   } else {
     io_runner->PostTask(FROM_HERE, base::Bind(&ChannelMojo::InitOnIOThread,
                                               base::Unretained(this)));
   }
 }
 
 ChannelMojo::~ChannelMojo() {
   Close();
@@ skipping 247 matching lines @@
     if (!ok) {
       LOG(ERROR) << "Failed to add new Mojo handle.";
       return MOJO_RESULT_UNKNOWN;
     }
   }
 
   return MOJO_RESULT_OK;
 }
 
 }  // namespace IPC