Mojo C++ bindings: support passing associated interface pointers/requests in method parameter lists…

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 302 matching lines @@
     // The object hasn't been bound.
     if (!waiter_) {
       DCHECK(!handle_.is_valid());
       return;
     }
 
     router_ = new MultiplexRouter(true, handle_.Pass(), waiter_);
     endpoint_client_.reset(new InterfaceEndpointClient(
         router_->CreateLocalEndpointHandle(kMasterInterfaceId), nullptr,
         make_scoped_ptr(new typename Interface::ResponseValidator_())));
-    proxy_.reset(new Proxy(endpoint_client_.get(), endpoint_client_->router()));
+    proxy_.reset(new Proxy(endpoint_client_.get()));
+    proxy_->serialization_context()->router = endpoint_client_->router();
 
     waiter_ = nullptr;
   }
 
   scoped_refptr<MultiplexRouter> router_;
 
   scoped_ptr<InterfaceEndpointClient> endpoint_client_;
   scoped_ptr<Proxy> proxy_;
 
   // |router_| (as well as other members above) is not initialized until
   // read/write with the message pipe handle is needed. |handle_| and |waiter_|
   // are valid between the Bind() call and the initialization of |router_|.
   ScopedMessagePipeHandle handle_;
   const MojoAsyncWaiter* waiter_;
 
   uint32_t version_;
 
   DISALLOW_COPY_AND_ASSIGN(InterfacePtrState);
 };
 
 }  // namespace internal
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_BINDINGS_LIB_INTERFACE_PTR_STATE_H_