| Index: mojo/public/cpp/bindings/lib/serialization_util.h
|
| diff --git a/mojo/public/cpp/bindings/lib/serialization_util.h b/mojo/public/cpp/bindings/lib/serialization_util.h
|
| index aa5806722c65fb5feeb304c63330da90d8e495ef..698e90d96284476a454885e241632da5747d1215 100644
|
| --- a/mojo/public/cpp/bindings/lib/serialization_util.h
|
| +++ b/mojo/public/cpp/bindings/lib/serialization_util.h
|
| @@ -69,8 +69,7 @@ inline void AssociatedInterfacePtrInfoToData(
|
| AssociatedInterfacePtrInfo<T> input,
|
| AssociatedInterface_Data* output) {
|
| output->version = input.version();
|
| - output->interface_id =
|
| - AssociatedInterfacePtrInfoHelper::PassHandle(&input).release();
|
| + output->interface_id = input.PassHandle().release();
|
| }
|
|
|
| template <typename T>
|
| @@ -78,8 +77,7 @@ inline void AssociatedInterfaceDataToPtrInfo(
|
| AssociatedInterface_Data* input,
|
| AssociatedInterfacePtrInfo<T>* output,
|
| MultiplexRouter* router) {
|
| - AssociatedInterfacePtrInfoHelper::SetHandle(
|
| - output,
|
| + output->set_handle(
|
| router->CreateLocalEndpointHandle(FetchAndReset(&input->interface_id)));
|
| output->set_version(input->version);
|
| }
|
|
|