ipc: Remove unnecessary attachment broker plumbing.

ipc/mojo/ipc_channel_mojo.h

 // 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.
 
 #ifndef IPC_IPC_CHANNEL_MOJO_H_
 #define IPC_IPC_CHANNEL_MOJO_H_
 
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 43 matching lines @@
   using CreateMessagingPipeCallback =
       base::Callback<void(mojo::ScopedMessagePipeHandle)>;
   using CreateMessagingPipeOnIOThreadCallback =
       base::Callback<void(mojo::ScopedMessagePipeHandle,
                           mojo::embedder::ChannelInfo*)>;
 
   // True if ChannelMojo should be used regardless of the flag.
   static bool ShouldBeUsed();
 
   // Create ChannelMojo. A bootstrap channel is created as well.
-  // |broker| must outlive the newly created channel.
   static scoped_ptr<ChannelMojo> Create(
       scoped_refptr<base::TaskRunner> io_runner,
       const ChannelHandle& channel_handle,
       Mode mode,
-      Listener* listener,
-      AttachmentBroker* broker);
+      Listener* listener);
 
   // Create a factory object for ChannelMojo.
   // The factory is used to create Mojo-based ChannelProxy family.
   // |host| must not be null.
-  // TODO(erikchen): Remove default parameter for |broker|. It exists only to
-  // make the upcoming refactor decomposable into smaller CLs.
-  // http://crbug.com/493414.
-  // |broker| must outlive the factory and all channels it creates.
   static scoped_ptr<ChannelFactory> CreateServerFactory(
       scoped_refptr<base::TaskRunner> io_runner,
-      const ChannelHandle& channel_handle,
-      AttachmentBroker* broker = nullptr);
+      const ChannelHandle& channel_handle);
 
-  // TODO(erikchen): Remove default parameter for |broker|. It exists only to
-  // make the upcoming refactor decomposable into smaller CLs.
-  // http://crbug.com/493414.
-  // |broker| must outlive the factory and all channels it creates.
   static scoped_ptr<ChannelFactory> CreateClientFactory(
       scoped_refptr<base::TaskRunner> io_runner,
-      const ChannelHandle& channel_handle,
-      AttachmentBroker* broker = nullptr);
+      const ChannelHandle& channel_handle);
 
   ~ChannelMojo() override;
 
   // Channel implementation
   bool Connect() override;
   void Close() override;
   bool Send(Message* message) override;
   bool IsSendThreadSafe() const override;
   base::ProcessId GetPeerPID() const override;
   base::ProcessId GetSelfPID() const override;
@@ skipping 17 matching lines @@
 
   // MessagePipeReader::Delegate
   void OnMessageReceived(Message& message) override;
   void OnPipeClosed(internal::MessagePipeReader* reader) override;
   void OnPipeError(internal::MessagePipeReader* reader) override;
 
  protected:
   ChannelMojo(scoped_refptr<base::TaskRunner> io_runner,
               const ChannelHandle& channel_handle,
               Mode mode,
-              Listener* listener,
-              AttachmentBroker* broker);
+              Listener* listener);
 
   void CreateMessagingPipe(mojo::embedder::ScopedPlatformHandle handle,
                            const CreateMessagingPipeCallback& callback);
   void InitMessageReader(mojo::ScopedMessagePipeHandle pipe, int32_t peer_pid);
 
   Listener* listener() const { return listener_; }
   void set_peer_pid(base::ProcessId pid) { peer_pid_ = pid; }
 
  private:
   struct ChannelInfoDeleter {
@@ skipping 40 matching lines @@
   scoped_ptr<ScopedIPCSupport> ipc_support_;
 
   base::WeakPtrFactory<ChannelMojo> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ChannelMojo);
 };
 
 }  // namespace IPC
 
 #endif  // IPC_IPC_CHANNEL_MOJO_H_