| Index: components/proximity_auth/device_to_device_authenticator.cc
|
| diff --git a/components/proximity_auth/device_to_device_authenticator.cc b/components/proximity_auth/device_to_device_authenticator.cc
|
| index ccc3fd1299008564e9296be237e87a1b25a2e36c..4335588f5596c0216b8932d7f7b8521413b9cb1d 100644
|
| --- a/components/proximity_auth/device_to_device_authenticator.cc
|
| +++ b/components/proximity_auth/device_to_device_authenticator.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "components/proximity_auth/device_to_device_authenticator.h"
|
|
|
| +#include <utility>
|
| +
|
| #include "base/time/time.h"
|
| #include "base/timer/timer.h"
|
| #include "components/proximity_auth/connection.h"
|
| @@ -35,7 +37,7 @@ DeviceToDeviceAuthenticator::DeviceToDeviceAuthenticator(
|
| scoped_ptr<SecureMessageDelegate> secure_message_delegate)
|
| : connection_(connection),
|
| account_id_(account_id),
|
| - secure_message_delegate_(secure_message_delegate.Pass()),
|
| + secure_message_delegate_(std::move(secure_message_delegate)),
|
| state_(State::NOT_STARTED),
|
| weak_ptr_factory_(this) {
|
| DCHECK(connection_);
|
| @@ -179,7 +181,7 @@ void DeviceToDeviceAuthenticator::Succeed() {
|
| callback_.Run(
|
| Result::SUCCESS,
|
| make_scoped_ptr(new DeviceToDeviceSecureContext(
|
| - secure_message_delegate_.Pass(), session_symmetric_key_,
|
| + std::move(secure_message_delegate_), session_symmetric_key_,
|
| responder_auth_message_, SecureContext::PROTOCOL_VERSION_THREE_ONE)));
|
| }
|
|
|
|
|