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

Unified Diff: remoting/protocol/pairing_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
« no previous file with comments | « remoting/protocol/pairing_authenticator_base.h ('k') | remoting/protocol/pairing_registry.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
}
« no previous file with comments | « remoting/protocol/pairing_authenticator_base.h ('k') | remoting/protocol/pairing_registry.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698