[mojo] Add GenericInterface_ to interface class variants

mojo/public/cpp/bindings/lib/interface_ptr_state.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_PUBLIC_CPP_BINDINGS_LIB_INTERFACE_PTR_STATE_H_
 #define MOJO_PUBLIC_CPP_BINDINGS_LIB_INTERFACE_PTR_STATE_H_
 
 #include <algorithm>  // For |std::swap()|.
 
 #include "base/logging.h"
@@ skipping 20 matching lines @@
 template <typename Interface, bool use_multiplex_router>
 class InterfacePtrState;
 
 // 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 InterfacePtrState<Interface, false> {
  public:
+  using GenericInterface = typename Interface::GenericInterface;
+
   InterfacePtrState()
       : proxy_(nullptr), router_(nullptr), waiter_(nullptr), version_(0u) {}
 
   ~InterfacePtrState() {
     // Destruction order matters here. We delete |proxy_| first, even though
     // |router_| may have a reference to it, so that destructors for any request
     // callbacks still pending can interact with the InterfacePtr.
     delete proxy_;
     delete router_;
   }
@@ skipping 36 matching lines @@
 
   void Swap(InterfacePtrState* other) {
     using std::swap;
     swap(other->proxy_, proxy_);
     swap(other->router_, router_);
     handle_.swap(other->handle_);
     swap(other->waiter_, waiter_);
     swap(other->version_, version_);
   }
 
-  void Bind(InterfacePtrInfo<Interface> info, const MojoAsyncWaiter* waiter) {
+  void Bind(InterfacePtrInfo<GenericInterface> info,
+            const MojoAsyncWaiter* waiter) {
     DCHECK(!proxy_);
     DCHECK(!router_);
     DCHECK(!handle_.is_valid());
     DCHECK(!waiter_);
     DCHECK_EQ(0u, version_);
     DCHECK(info.is_valid());
 
     handle_ = info.PassHandle();
     waiter_ = waiter;
     version_ = info.version();
   }
 
   bool HasAssociatedInterfaces() const { return false; }
 
   bool WaitForIncomingResponse() {
     ConfigureProxyIfNecessary();
 
     DCHECK(router_);
     return router_->WaitForIncomingMessage(MOJO_DEADLINE_INDEFINITE);
   }
 
   // After this method is called, the object is in an invalid state and
   // shouldn't be reused.
-  InterfacePtrInfo<Interface> PassInterface() {
-    return InterfacePtrInfo<Interface>(
+  InterfacePtrInfo<GenericInterface> PassInterface() {
+    return InterfacePtrInfo<GenericInterface>(
         router_ ? router_->PassMessagePipe() : handle_.Pass(), version_);
   }
 
   bool is_bound() const { return handle_.is_valid() || router_; }
 
   bool encountered_error() const {
     return router_ ? router_->encountered_error() : false;
   }
 
   void set_connection_error_handler(const Closure& error_handler) {
@@ skipping 52 matching lines @@
   uint32_t version_;
 
   DISALLOW_COPY_AND_ASSIGN(InterfacePtrState);
 };
 
 // Uses a multiplexing router. If |Interface| has methods to pass associated
 // interface pointers or requests, this specialization should be used.
 template <typename Interface>
 class InterfacePtrState<Interface, true> {
  public:
+  using GenericInterface = typename Interface::GenericInterface;
+
   InterfacePtrState() : waiter_(nullptr), version_(0u) {}
 
   ~InterfacePtrState() {
     endpoint_client_.reset();
     proxy_.reset();
     if (router_)
       router_->CloseMessagePipe();
   }
 
   Interface* instance() {
@@ skipping 36 matching lines @@
   void Swap(InterfacePtrState* other) {
     using std::swap;
     swap(other->router_, router_);
     swap(other->endpoint_client_, endpoint_client_);
     swap(other->proxy_, proxy_);
     handle_.swap(other->handle_);
     swap(other->waiter_, waiter_);
     swap(other->version_, version_);
   }
 
-  void Bind(InterfacePtrInfo<Interface> info, const MojoAsyncWaiter* waiter) {
+  void Bind(InterfacePtrInfo<GenericInterface> info,
+            const MojoAsyncWaiter* waiter) {
     DCHECK(!router_);
     DCHECK(!endpoint_client_);
     DCHECK(!proxy_);
     DCHECK(!handle_.is_valid());
     DCHECK(!waiter_);
     DCHECK_EQ(0u, version_);
     DCHECK(info.is_valid());
 
     handle_ = info.PassHandle();
     waiter_ = waiter;
     version_ = info.version();
   }
 
   bool HasAssociatedInterfaces() const {
     return router_ ? router_->HasAssociatedEndpoints() : false;
   }
 
   bool WaitForIncomingResponse() {
     ConfigureProxyIfNecessary();
 
     DCHECK(router_);
     return router_->WaitForIncomingMessage(MOJO_DEADLINE_INDEFINITE);
   }
 
   // After this method is called, the object is in an invalid state and
   // shouldn't be reused.
-  InterfacePtrInfo<Interface> PassInterface() {
+  InterfacePtrInfo<GenericInterface> PassInterface() {
     endpoint_client_.reset();
     proxy_.reset();
-    return InterfacePtrInfo<Interface>(
+    return InterfacePtrInfo<GenericInterface>(
         router_ ? router_->PassMessagePipe() : handle_.Pass(), version_);
   }
 
   bool is_bound() const { return handle_.is_valid() || endpoint_client_; }
 
   bool encountered_error() const {
     return endpoint_client_ ? endpoint_client_->encountered_error() : false;
   }
 
   void set_connection_error_handler(const Closure& error_handler) {
@@ skipping 57 matching lines @@
 
   uint32_t version_;
 
   DISALLOW_COPY_AND_ASSIGN(InterfacePtrState);
 };
 
 }  // namespace internal
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_BINDINGS_LIB_INTERFACE_PTR_STATE_H_