Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3586)

Unified Diff: remoting/protocol/negotiating_authenticator_base.cc

Issue 1864213002: Convert //remoting to use std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Mac IWYU Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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();
« no previous file with comments | « remoting/protocol/negotiating_authenticator_base.h ('k') | remoting/protocol/negotiating_authenticator_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698