Mojo C++ bindings: remove usage of AssociatedGroup from ipc/

ipc/ipc_channel.h

 // 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.
 
 #ifndef IPC_IPC_CHANNEL_H_
 #define IPC_IPC_CHANNEL_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/files/scoped_file.h"
 #include "base/memory/ref_counted.h"
 #include "base/process/process.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "build/build_config.h"
 #include "ipc/ipc.mojom.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_sender.h"
-#include "mojo/public/cpp/bindings/associated_group.h"
 #include "mojo/public/cpp/bindings/associated_interface_ptr.h"
 #include "mojo/public/cpp/bindings/associated_interface_request.h"
 #include "mojo/public/cpp/bindings/scoped_interface_endpoint_handle.h"
 #include "mojo/public/cpp/bindings/thread_safe_interface_ptr.h"
 
 #if defined(OS_POSIX)
 #include <sys/types.h>
 #endif
 
 namespace IPC {
@@ skipping 49 matching lines @@
 
   // Helper interface a Channel may implement to expose support for associated
   // Mojo interfaces.
   class IPC_EXPORT AssociatedInterfaceSupport {
    public:
     using GenericAssociatedInterfaceFactory =
         base::Callback<void(mojo::ScopedInterfaceEndpointHandle)>;
 
     virtual ~AssociatedInterfaceSupport() {}
 
-    // Accesses the AssociatedGroup used to associate new interface endpoints
-    // with this Channel. Must be safe to call from any thread.
-    virtual mojo::AssociatedGroup* GetAssociatedGroup() = 0;
-
     // Returns a ThreadSafeForwarded for this channel which can be used to
     // safely send mojom::Channel requests from arbitrary threads.
     virtual std::unique_ptr<mojo::ThreadSafeForwarder<mojom::Channel>>
     CreateThreadSafeChannel() = 0;
 
     // Adds an interface factory to this channel for interface |name|. Must be
     // safe to call from any thread.
     virtual void AddGenericAssociatedInterface(
         const std::string& name,
         const GenericAssociatedInterfaceFactory& factory) = 0;
@@ skipping 12 matching lines @@
         const AssociatedInterfaceFactory<Interface>& factory) {
       AddGenericAssociatedInterface(
           Interface::Name_,
           base::Bind(&BindAssociatedInterfaceRequest<Interface>, factory));
     }
 
     // Template helper to request a remote associated interface.
     template <typename Interface>
     void GetRemoteAssociatedInterface(
         mojo::AssociatedInterfacePtr<Interface>* proxy) {
-      mojo::AssociatedInterfaceRequest<Interface> request =
-          mojo::MakeRequest(proxy, GetAssociatedGroup());
+      auto request = mojo::MakeRequest(proxy);
       GetGenericRemoteAssociatedInterface(
           Interface::Name_, request.PassHandle());
     }
 
    private:
     template <typename Interface>
     static void BindAssociatedInterfaceRequest(
         const AssociatedInterfaceFactory<Interface>& factory,
         mojo::ScopedInterfaceEndpointHandle handle) {
       mojo::AssociatedInterfaceRequest<Interface> request;
@@ skipping 142 matching lines @@
   // of Connect().
   void WillConnect();
 
  private:
   bool did_start_connect_ = false;
 };
 
 }  // namespace IPC
 
 #endif  // IPC_IPC_CHANNEL_H_