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

Unified Diff: remoting/protocol/third_party_authenticator_base.h

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/third_party_authenticator_base.h
diff --git a/remoting/protocol/third_party_authenticator_base.h b/remoting/protocol/third_party_authenticator_base.h
index e990907d30defa22266b50a128234a1ffb1bb19d..6e2fe5749f3d4af7b07d2eeabbd097bb8914e163 100644
--- a/remoting/protocol/third_party_authenticator_base.h
+++ b/remoting/protocol/third_party_authenticator_base.h
@@ -5,11 +5,11 @@
#ifndef REMOTING_PROTOCOL_THIRD_PARTY_AUTHENTICATOR_BASE_H_
#define REMOTING_PROTOCOL_THIRD_PARTY_AUTHENTICATOR_BASE_H_
+#include <memory>
#include <string>
#include "base/callback.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "remoting/protocol/authenticator.h"
#include "third_party/webrtc/libjingle/xmllite/qname.h"
@@ -41,9 +41,10 @@ class ThirdPartyAuthenticatorBase : public Authenticator {
RejectionReason rejection_reason() const override;
void ProcessMessage(const buzz::XmlElement* message,
const base::Closure& resume_callback) override;
- scoped_ptr<buzz::XmlElement> GetNextMessage() override;
+ std::unique_ptr<buzz::XmlElement> GetNextMessage() override;
const std::string& GetAuthKey() const override;
- scoped_ptr<ChannelAuthenticator> CreateChannelAuthenticator() const override;
+ std::unique_ptr<ChannelAuthenticator> CreateChannelAuthenticator()
+ const override;
protected:
// XML tag names for third party authentication fields.
@@ -66,7 +67,7 @@ class ThirdPartyAuthenticatorBase : public Authenticator {
// Adds the token related XML elements to the message.
virtual void AddTokenElements(buzz::XmlElement* message) = 0;
- scoped_ptr<Authenticator> underlying_;
+ std::unique_ptr<Authenticator> underlying_;
State token_state_;
bool started_;
RejectionReason rejection_reason_;
« no previous file with comments | « remoting/protocol/stream_message_pipe_adapter.cc ('k') | remoting/protocol/third_party_authenticator_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698