| Index: remoting/protocol/pairing_authenticator_base.cc
|
| diff --git a/remoting/protocol/pairing_authenticator_base.cc b/remoting/protocol/pairing_authenticator_base.cc
|
| index 4adc6ee4aa2a64a9624170781726fc7df1f2a19f..e622689d100c740846670ba1faaad8ffe7da9d2f 100644
|
| --- a/remoting/protocol/pairing_authenticator_base.cc
|
| +++ b/remoting/protocol/pairing_authenticator_base.cc
|
| @@ -74,9 +74,10 @@ void PairingAuthenticatorBase::ProcessMessage(
|
| weak_factory_.GetWeakPtr(), resume_callback));
|
| }
|
|
|
| -scoped_ptr<buzz::XmlElement> PairingAuthenticatorBase::GetNextMessage() {
|
| +std::unique_ptr<buzz::XmlElement> PairingAuthenticatorBase::GetNextMessage() {
|
| DCHECK_EQ(state(), MESSAGE_READY);
|
| - scoped_ptr<buzz::XmlElement> result = spake2_authenticator_->GetNextMessage();
|
| + std::unique_ptr<buzz::XmlElement> result =
|
| + spake2_authenticator_->GetNextMessage();
|
| MaybeAddErrorMessage(result.get());
|
| return result;
|
| }
|
| @@ -85,7 +86,7 @@ const std::string& PairingAuthenticatorBase::GetAuthKey() const {
|
| return spake2_authenticator_->GetAuthKey();
|
| }
|
|
|
| -scoped_ptr<ChannelAuthenticator>
|
| +std::unique_ptr<ChannelAuthenticator>
|
| PairingAuthenticatorBase::CreateChannelAuthenticator() const {
|
| return spake2_authenticator_->CreateChannelAuthenticator();
|
| }
|
|
|