Index: mojo/public/cpp/bindings/lib/interface_ptr_state.h |
diff --git a/mojo/public/cpp/bindings/lib/interface_ptr_state.h b/mojo/public/cpp/bindings/lib/interface_ptr_state.h |
index cb38dceb8f7f335e4f3dc7c56a2e470883a6020f..39710b209478b803d369ec8aa7c016718526945d 100644 |
--- a/mojo/public/cpp/bindings/lib/interface_ptr_state.h |
+++ b/mojo/public/cpp/bindings/lib/interface_ptr_state.h |
@@ -320,7 +320,8 @@ class InterfacePtrState<Interface, true> { |
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; |
} |