Index: remoting/protocol/negotiating_authenticator_base.cc |
diff --git a/remoting/protocol/negotiating_authenticator_base.cc b/remoting/protocol/negotiating_authenticator_base.cc |
index 87970b42d437ecb8a6479d4d31d7efab2bb02eba..d31ad5720952125c1b50afabe73f8db00dc85c30 100644 |
--- a/remoting/protocol/negotiating_authenticator_base.cc |
+++ b/remoting/protocol/negotiating_authenticator_base.cc |
@@ -127,12 +127,12 @@ void NegotiatingAuthenticatorBase::UpdateState( |
resume_callback.Run(); |
} |
-scoped_ptr<buzz::XmlElement> |
+std::unique_ptr<buzz::XmlElement> |
NegotiatingAuthenticatorBase::GetNextMessageInternal() { |
DCHECK_EQ(state(), MESSAGE_READY); |
DCHECK(current_method_ != Method::INVALID); |
- scoped_ptr<buzz::XmlElement> result; |
+ std::unique_ptr<buzz::XmlElement> result; |
if (current_authenticator_->state() == MESSAGE_READY) { |
result = current_authenticator_->GetNextMessage(); |
} else { |
@@ -154,7 +154,7 @@ const std::string& NegotiatingAuthenticatorBase::GetAuthKey() const { |
return current_authenticator_->GetAuthKey(); |
} |
-scoped_ptr<ChannelAuthenticator> |
+std::unique_ptr<ChannelAuthenticator> |
NegotiatingAuthenticatorBase::CreateChannelAuthenticator() const { |
DCHECK_EQ(state(), ACCEPTED); |
return current_authenticator_->CreateChannelAuthenticator(); |