Use a binding set for BrowserAssociatedInterface

content/public/browser/browser_associated_interface.h

 // Copyright 2016 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 CONTENT_BROWSER_BROWSER_ASSOCIATED_INTERFACE_H_
 #define CONTENT_BROWSER_BROWSER_ASSOCIATED_INTERFACE_H_
 
 #include <memory>
 #include <string>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/browser_message_filter.h"
 #include "content/public/browser/browser_thread.h"
 #include "ipc/ipc_channel_proxy.h"
-#include "mojo/public/cpp/bindings/associated_binding.h"
+#include "mojo/public/cpp/bindings/associated_binding_set.h"
 #include "mojo/public/cpp/bindings/scoped_interface_endpoint_handle.h"
 
 namespace content {
 
 // A helper interface which owns an associated interface binding on the IO
 // thread. Subclassess of BrowserMessageFilter may use this to simplify
 // the transition to Mojo interfaces.
 //
 // In general the correct pattern for using this is as follows:
 //
@@ skipping 41 matching lines @@
   class InternalState : public base::RefCountedThreadSafe<InternalState> {
    public:
     explicit InternalState(Interface* impl) : impl_(impl) {}
 
     void Initialize() {
       if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) {
         BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
                                 base::Bind(&InternalState::Initialize, this));
         return;
       }
-      binding_.reset(new mojo::AssociatedBinding<Interface>(impl_));
+      bindings_.reset(new mojo::AssociatedBindingSet<Interface>);
     }
 
     void ShutDown() {
       if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) {
         BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
                                 base::Bind(&InternalState::ShutDown, this));
         return;
       }
-      binding_.reset();
+      bindings_.reset();
     }
 
     void BindRequest(mojo::ScopedInterfaceEndpointHandle handle) {
       DCHECK_CURRENTLY_ON(BrowserThread::IO);
-      // If this interface has already been shut down or is already bound, we
-      // drop the request.
-      if (!binding_ || binding_->is_bound())
+      // If this interface has already been shut down we drop the request.
+      if (!bindings_)
         return;
-
-      binding_->Bind(mojo::MakeAssociatedRequest<Interface>(std::move(handle)));
-      binding_->set_connection_error_handler(
-          base::Bind(&InternalState::ShutDown, base::Unretained(this)));
+      bindings_->AddBinding(
+          impl_, mojo::MakeAssociatedRequest<Interface>(std::move(handle)));
     }
 
    private:
     friend class base::RefCountedThreadSafe<InternalState>;
 
     ~InternalState() {}
 
     Interface* impl_;
-    std::unique_ptr<mojo::AssociatedBinding<Interface>> binding_;
+    std::unique_ptr<mojo::AssociatedBindingSet<Interface>> bindings_;
 
     DISALLOW_COPY_AND_ASSIGN(InternalState);
   };
 
   scoped_refptr<InternalState> internal_state_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserAssociatedInterface);
 };
 
 };
 
 #endif  // CONTENT_BROWSER_BROWSER_ASSOCIATED_INTERFACE_H_