Revert of Adds associated interface support to IPC::Channel

ipc/ipc_mojo_bootstrap.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/ipc_mojo_bootstrap.h"
 
 #include <stdint.h>
 
 #include <map>
 #include <memory>
@@ skipping 573 matching lines @@
     endpoint_client_.reset();
     if (controller_)
       controller_->ShutDown();
   }
 
   void set_connection_error_handler(const base::Closure& handler) {
     DCHECK(endpoint_client_);
     endpoint_client_->set_connection_error_handler(handler);
   }
 
-  mojo::AssociatedGroup* associated_group() {
-    DCHECK(controller_);
-    return controller_->associated_group();
-  }
-
   void Bind(mojo::ScopedMessagePipeHandle handle) {
     DCHECK(!controller_);
     controller_ =
         new ChannelAssociatedGroupController(false, std::move(handle));
     stub_.serialization_context()->group_controller = controller_;
 
     endpoint_client_.reset(new mojo::InterfaceEndpointClient(
         controller_->CreateLocalEndpointHandle(mojo::kMasterInterfaceId),
         &stub_,
         base::MakeUnique<typename mojom::Bootstrap::RequestValidator_>(),
@@ skipping 10 matching lines @@
 
 // MojoBootstrap for the server process. You should create the instance
 // using MojoBootstrap::Create().
 class MojoServerBootstrap : public MojoBootstrap {
  public:
   MojoServerBootstrap();
 
  private:
   // MojoBootstrap implementation.
   void Connect() override;
-  mojo::AssociatedGroup* GetAssociatedGroup() override {
-    return bootstrap_.associated_group();
-  }
 
   void OnInitDone(int32_t peer_pid);
 
   BootstrapMasterProxy bootstrap_;
   IPC::mojom::ChannelAssociatedPtrInfo send_channel_;
   IPC::mojom::ChannelAssociatedRequest receive_channel_request_;
 
   DISALLOW_COPY_AND_ASSIGN(MojoServerBootstrap);
 };
 
@@ skipping 39 matching lines @@
 
 // MojoBootstrap for client processes. You should create the instance
 // using MojoBootstrap::Create().
 class MojoClientBootstrap : public MojoBootstrap, public mojom::Bootstrap {
  public:
   MojoClientBootstrap();
 
  private:
   // MojoBootstrap implementation.
   void Connect() override;
-  mojo::AssociatedGroup* GetAssociatedGroup() override {
-    return binding_.associated_group();
-  }
 
   // mojom::Bootstrap implementation.
   void Init(mojom::ChannelAssociatedRequest receive_channel,
             mojom::ChannelAssociatedPtrInfo send_channel,
             int32_t peer_pid,
             const InitCallback& callback) override;
 
   BootstrapMasterBinding binding_;
 
   DISALLOW_COPY_AND_ASSIGN(MojoClientBootstrap);
@@ skipping 67 matching lines @@
 
 bool MojoBootstrap::HasFailed() const {
   return state() == STATE_ERROR;
 }
 
 mojo::ScopedMessagePipeHandle MojoBootstrap::TakeHandle() {
   return std::move(handle_);
 }
 
 }  // namespace IPC