| Index: mojo/edk/system/message_in_transit.cc
|
| diff --git a/mojo/edk/system/message_in_transit.cc b/mojo/edk/system/message_in_transit.cc
|
| index 05fd98f08c8705f57944c5989af701d5f4696dbb..310fa482098d38d5eec0a73db18627960e6424d4 100644
|
| --- a/mojo/edk/system/message_in_transit.cc
|
| +++ b/mojo/edk/system/message_in_transit.cc
|
| @@ -5,8 +5,8 @@
|
| #include "mojo/edk/system/message_in_transit.h"
|
|
|
| #include <string.h>
|
| -
|
| #include <ostream>
|
| +#include <utility>
|
|
|
| #include "base/logging.h"
|
| #include "mojo/edk/system/configuration.h"
|
| @@ -133,7 +133,7 @@ void MessageInTransit::SetDispatchers(
|
| DCHECK(!dispatchers_);
|
| DCHECK(!transport_data_);
|
|
|
| - dispatchers_ = dispatchers.Pass();
|
| + dispatchers_ = std::move(dispatchers);
|
| }
|
|
|
| void MessageInTransit::SetTransportData(
|
| @@ -142,7 +142,7 @@ void MessageInTransit::SetTransportData(
|
| DCHECK(!transport_data_);
|
| DCHECK(!dispatchers_);
|
|
|
| - transport_data_ = transport_data.Pass();
|
| + transport_data_ = std::move(transport_data);
|
| UpdateTotalSize();
|
| }
|
|
|
| @@ -152,7 +152,7 @@ void MessageInTransit::SerializeAndCloseDispatchers() {
|
| if (!dispatchers_ || !dispatchers_->size())
|
| return;
|
|
|
| - transport_data_.reset(new TransportData(dispatchers_.Pass()));
|
| + transport_data_.reset(new TransportData(std::move(dispatchers_)));
|
|
|
| // Update the sizes in the message header.
|
| UpdateTotalSize();
|
|
|