| Index: remoting/protocol/third_party_authenticator_base.cc
|
| diff --git a/remoting/protocol/third_party_authenticator_base.cc b/remoting/protocol/third_party_authenticator_base.cc
|
| index a0bdce4f245c3d15634b6cfcdc9ab88b9a1a973a..ba03712aa37941d1128530bc98ad22d053541199 100644
|
| --- a/remoting/protocol/third_party_authenticator_base.cc
|
| +++ b/remoting/protocol/third_party_authenticator_base.cc
|
| @@ -68,10 +68,11 @@ void ThirdPartyAuthenticatorBase::ProcessMessage(
|
| }
|
| }
|
|
|
| -scoped_ptr<buzz::XmlElement> ThirdPartyAuthenticatorBase::GetNextMessage() {
|
| +std::unique_ptr<buzz::XmlElement>
|
| +ThirdPartyAuthenticatorBase::GetNextMessage() {
|
| DCHECK_EQ(state(), MESSAGE_READY);
|
|
|
| - scoped_ptr<buzz::XmlElement> message;
|
| + std::unique_ptr<buzz::XmlElement> message;
|
| if (underlying_ && underlying_->state() == MESSAGE_READY) {
|
| message = underlying_->GetNextMessage();
|
| } else {
|
| @@ -91,7 +92,7 @@ const std::string& ThirdPartyAuthenticatorBase::GetAuthKey() const {
|
| return underlying_->GetAuthKey();
|
| }
|
|
|
| -scoped_ptr<ChannelAuthenticator>
|
| +std::unique_ptr<ChannelAuthenticator>
|
| ThirdPartyAuthenticatorBase::CreateChannelAuthenticator() const {
|
| DCHECK_EQ(state(), ACCEPTED);
|
|
|
|
|