[mojo] Add GenericInterface_ to interface class variants

mojo/common/weak_binding_set.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 MOJO_COMMON_WEAK_BINDING_SET_H_
 #define MOJO_COMMON_WEAK_BINDING_SET_H_
 
 #include <algorithm>
 #include <vector>
 
 #include "base/memory/weak_ptr.h"
 #include "mojo/public/cpp/bindings/binding.h"
 
 namespace mojo {
 
 template <typename Interface>
 class WeakBinding;
 
 // Use this class to manage a set of weak pointers to bindings each of which is
 // owned by the pipe they are bound to.
 template <typename Interface>
 class WeakBindingSet {
  public:
+  using GenericInterface = typename Interface::GenericInterface;
+
   WeakBindingSet() {}
   ~WeakBindingSet() { CloseAllBindings(); }
 
   void set_connection_error_handler(const Closure& error_handler) {
     error_handler_ = error_handler;
   }
 
-  void AddBinding(Interface* impl, InterfaceRequest<Interface> request) {
+  void AddBinding(Interface* impl,
+                  InterfaceRequest<GenericInterface> request) {
     auto binding = new WeakBinding<Interface>(impl, request.Pass());
     binding->set_connection_error_handler([this]() { OnConnectionError(); });
     bindings_.push_back(binding->GetWeakPtr());
   }
 
   void CloseAllBindings() {
     for (const auto& it : bindings_) {
       if (it) {
         it->Close();
         delete it.get();
@@ skipping 19 matching lines @@
 
   Closure error_handler_;
   std::vector<base::WeakPtr<WeakBinding<Interface>>> bindings_;
 
   DISALLOW_COPY_AND_ASSIGN(WeakBindingSet);
 };
 
 template <typename Interface>
 class WeakBinding {
  public:
-  WeakBinding(Interface* impl, InterfaceRequest<Interface> request)
+  using GenericInterface = typename Interface::GenericInterface;
+
+  WeakBinding(Interface* impl, InterfaceRequest<GenericInterface> request)
       : binding_(impl, request.Pass()),
         weak_ptr_factory_(this) {
     binding_.set_connection_error_handler([this]() { OnConnectionError(); });
   }
 
   ~WeakBinding() {}
 
   void set_connection_error_handler(const Closure& error_handler) {
     error_handler_ = error_handler;
   }
@@ skipping 14 matching lines @@
   Binding<Interface> binding_;
   Closure error_handler_;
   base::WeakPtrFactory<WeakBinding> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WeakBinding);
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_COMMON_WEAK_BINDING_SET_H_