| Index: third_party/mojo/src/mojo/edk/system/transport_data.cc
|
| diff --git a/third_party/mojo/src/mojo/edk/system/transport_data.cc b/third_party/mojo/src/mojo/edk/system/transport_data.cc
|
| index 9bcecc4fa9cabac668ce6590d0f9590293eaf39c..2605004db641f8efb71ce6f983aca8d1508b67fc 100644
|
| --- a/third_party/mojo/src/mojo/edk/system/transport_data.cc
|
| +++ b/third_party/mojo/src/mojo/edk/system/transport_data.cc
|
| @@ -5,6 +5,7 @@
|
| #include "third_party/mojo/src/mojo/edk/system/transport_data.h"
|
|
|
| #include <string.h>
|
| +#include <utility>
|
|
|
| #include "base/logging.h"
|
| #include "third_party/mojo/src/mojo/edk/system/channel.h"
|
| @@ -194,7 +195,7 @@ TransportData::TransportData(scoped_ptr<DispatcherVector> dispatchers,
|
| TransportData::TransportData(
|
| embedder::ScopedPlatformHandleVectorPtr platform_handles,
|
| size_t serialized_platform_handle_size)
|
| - : buffer_size_(), platform_handles_(platform_handles.Pass()) {
|
| + : buffer_size_(), platform_handles_(std::move(platform_handles)) {
|
| buffer_size_ = MessageInTransit::RoundUpMessageAlignment(
|
| sizeof(Header) +
|
| platform_handles_->size() * serialized_platform_handle_size);
|
| @@ -335,7 +336,7 @@ scoped_ptr<DispatcherVector> TransportData::DeserializeDispatchers(
|
| channel, handle_table[i].type, source, size, platform_handles.get());
|
| }
|
|
|
| - return dispatchers.Pass();
|
| + return dispatchers;
|
| }
|
|
|
| } // namespace system
|
|
|