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

Unified Diff: remoting/protocol/v2_authenticator.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
« no previous file with comments | « remoting/protocol/transport_context.cc ('k') | remoting/protocol/v2_authenticator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/v2_authenticator.h
diff --git a/remoting/protocol/v2_authenticator.h b/remoting/protocol/v2_authenticator.h
index 770d86f888f8bab671b352bf84aa986bc04dad7f..336678d6eb2b955aeee9ef3bf884708ae0f686a0 100644
--- a/remoting/protocol/v2_authenticator.h
+++ b/remoting/protocol/v2_authenticator.h
@@ -5,6 +5,7 @@
#ifndef REMOTING_PROTOCOL_V2_AUTHENTICATOR_H_
#define REMOTING_PROTOCOL_V2_AUTHENTICATOR_H_
+#include <memory>
#include <queue>
#include <string>
@@ -12,7 +13,6 @@
#include "base/gtest_prod_util.h"
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "crypto/p224_spake.h"
#include "remoting/protocol/authenticator.h"
@@ -26,11 +26,11 @@ class V2Authenticator : public Authenticator {
public:
static bool IsEkeMessage(const buzz::XmlElement* message);
- static scoped_ptr<Authenticator> CreateForClient(
+ static std::unique_ptr<Authenticator> CreateForClient(
const std::string& shared_secret,
State initial_state);
- static scoped_ptr<Authenticator> CreateForHost(
+ static std::unique_ptr<Authenticator> CreateForHost(
const std::string& local_cert,
scoped_refptr<RsaKeyPair> key_pair,
const std::string& shared_secret,
@@ -44,9 +44,10 @@ class V2Authenticator : 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;
private:
FRIEND_TEST_ALL_PREFIXES(V2AuthenticatorTest, InvalidSecret);
« no previous file with comments | « remoting/protocol/transport_context.cc ('k') | remoting/protocol/v2_authenticator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698