| Index: remoting/protocol/pairing_authenticator_base.cc
|
| diff --git a/remoting/protocol/pairing_authenticator_base.cc b/remoting/protocol/pairing_authenticator_base.cc
|
| index 4375e6557a7e42734a9360e7559b07b9a2120912..d063dc3b17c51858087e892b18032b6fb05cbdeb 100644
|
| --- a/remoting/protocol/pairing_authenticator_base.cc
|
| +++ b/remoting/protocol/pairing_authenticator_base.cc
|
| @@ -91,7 +91,7 @@ scoped_ptr<buzz::XmlElement> PairingAuthenticatorBase::GetNextMessage() {
|
| scoped_ptr<buzz::XmlElement> result = v2_authenticator_->GetNextMessage();
|
| AddPairingElements(result.get());
|
| MaybeAddErrorMessage(result.get());
|
| - return result.Pass();
|
| + return result;
|
| }
|
|
|
| const std::string& PairingAuthenticatorBase::GetAuthKey() const {
|
| @@ -153,7 +153,7 @@ void PairingAuthenticatorBase::SetAuthenticatorAndProcessMessage(
|
| DCHECK(!v2_authenticator_);
|
| DCHECK(authenticator);
|
| waiting_for_authenticator_ = false;
|
| - v2_authenticator_ = authenticator.Pass();
|
| + v2_authenticator_ = std::move(authenticator);
|
| if (message) {
|
| ProcessMessage(message, resume_callback);
|
| } else {
|
|
|