[mojo] Add GenericInterface_ to interface class variants

mojo/public/cpp/bindings/lib/binding_state.h

 // Copyright 2015 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_PUBLIC_CPP_BINDINGS_LIB_BINDING_STATE_H_
 #define MOJO_PUBLIC_CPP_BINDINGS_LIB_BINDING_STATE_H_
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
@@ skipping 19 matching lines @@
 template <typename Interface, bool use_multiplex_router>
 class BindingState;
 
 // Uses a single-threaded, dedicated router. If |Interface| doesn't have any
 // methods to pass associated interface pointers or requests, there won't be
 // multiple interfaces running on the underlying message pipe. In that case, we
 // can use this specialization to reduce cost.
 template <typename Interface>
 class BindingState<Interface, false> {
  public:
+  using GenericInterface = typename Interface::GenericInterface;
+
   explicit BindingState(Interface* impl) : impl_(impl) {
     stub_.set_sink(impl_);
   }
 
   ~BindingState() {
     if (router_)
       Close();
   }
 
   void Bind(ScopedMessagePipeHandle handle, const MojoAsyncWaiter* waiter) {
@@ skipping 24 matching lines @@
     DCHECK(router_);
     return router_->WaitForIncomingMessage(deadline);
   }
 
   void Close() {
     DCHECK(router_);
     router_->CloseMessagePipe();
     DestroyRouter();
   }
 
-  InterfaceRequest<Interface> Unbind() {
-    InterfaceRequest<Interface> request =
-        MakeRequest<Interface>(router_->PassMessagePipe());
+  InterfaceRequest<GenericInterface> Unbind() {
+    InterfaceRequest<GenericInterface> request =
+        MakeRequest<GenericInterface>(router_->PassMessagePipe());
     DestroyRouter();
     return request.Pass();
   }
 
   void set_connection_error_handler(const Closure& error_handler) {
     connection_error_handler_ = error_handler;
   }
 
   Interface* impl() { return impl_; }
 
@@ skipping 24 matching lines @@
   Closure connection_error_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(BindingState);
 };
 
 // Uses a multiplexing router. If |Interface| has methods to pass associated
 // interface pointers or requests, this specialization should be used.
 template <typename Interface>
 class BindingState<Interface, true> {
  public:
+  using GenericInterface = typename Interface::GenericInterface;
+
   explicit BindingState(Interface* impl) : impl_(impl) {
     stub_.set_sink(impl_);
   }
 
   ~BindingState() {
     if (router_)
       Close();
   }
 
   void Bind(ScopedMessagePipeHandle handle, const MojoAsyncWaiter* waiter) {
@@ skipping 29 matching lines @@
     return router_->WaitForIncomingMessage(deadline);
   }
 
   void Close() {
     DCHECK(router_);
     endpoint_client_.reset();
     router_->CloseMessagePipe();
     router_ = nullptr;
   }
 
-  InterfaceRequest<Interface> Unbind() {
+  InterfaceRequest<GenericInterface> Unbind() {
     endpoint_client_.reset();
-    InterfaceRequest<Interface> request =
-        MakeRequest<Interface>(router_->PassMessagePipe());
+    InterfaceRequest<GenericInterface> request =
+        MakeRequest<GenericInterface>(router_->PassMessagePipe());
     router_ = nullptr;
     return request.Pass();
   }
 
   void set_connection_error_handler(const Closure& error_handler) {
     connection_error_handler_ = error_handler;
   }
 
   Interface* impl() { return impl_; }
 
@@ skipping 21 matching lines @@
   Interface* impl_;
   Closure connection_error_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(BindingState);
 };
 
 }  // namesapce internal
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_BINDINGS_LIB_BINDING_STATE_H_