| Index: mojo/edk/system/transport_data.cc
|
| diff --git a/mojo/edk/system/transport_data.cc b/mojo/edk/system/transport_data.cc
|
| index 92567f157d7241698d54c6fa0ea5c0e2a254cf76..18ba1382b3ce11f7f297fffc92211131a146b5b3 100644
|
| --- a/mojo/edk/system/transport_data.cc
|
| +++ b/mojo/edk/system/transport_data.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "mojo/edk/system/transport_data.h"
|
|
|
| +#include <utility>
|
| +
|
| #include "base/logging.h"
|
| #include "mojo/edk/system/configuration.h"
|
| #include "mojo/edk/system/message_in_transit.h"
|
| @@ -186,10 +188,9 @@ TransportData::TransportData(scoped_ptr<DispatcherVector> dispatchers)
|
| // |dispatchers_| will be destroyed as it goes out of scope.
|
| }
|
|
|
| -TransportData::TransportData(
|
| - ScopedPlatformHandleVectorPtr platform_handles,
|
| - size_t serialized_platform_handle_size)
|
| - : buffer_size_(), platform_handles_(platform_handles.Pass()) {
|
| +TransportData::TransportData(ScopedPlatformHandleVectorPtr platform_handles,
|
| + size_t serialized_platform_handle_size)
|
| + : buffer_size_(), platform_handles_(std::move(platform_handles)) {
|
| buffer_size_ = MessageInTransit::RoundUpMessageAlignment(
|
| sizeof(Header) +
|
| platform_handles_->size() * serialized_platform_handle_size);
|
| @@ -326,7 +327,7 @@ scoped_ptr<DispatcherVector> TransportData::DeserializeDispatchers(
|
| handle_table[i].type, source, size, platform_handles.get());
|
| }
|
|
|
| - return dispatchers.Pass();
|
| + return dispatchers;
|
| }
|
|
|
| } // namespace edk
|
|
|