Index: remoting/protocol/me2me_host_authenticator_factory.h |
diff --git a/remoting/protocol/me2me_host_authenticator_factory.h b/remoting/protocol/me2me_host_authenticator_factory.h |
index 6515ba8e63ff06f4f80d88cf25a0dce2a383f1bd..e081ba81faa6b1b869e71aeb303968b12941c84b 100644 |
--- a/remoting/protocol/me2me_host_authenticator_factory.h |
+++ b/remoting/protocol/me2me_host_authenticator_factory.h |
@@ -5,12 +5,12 @@ |
#ifndef REMOTING_PROTOCOL_ME2ME_HOST_AUTHENTICATOR_FACTORY_H_ |
#define REMOTING_PROTOCOL_ME2ME_HOST_AUTHENTICATOR_FACTORY_H_ |
+#include <memory> |
#include <string> |
#include "base/compiler_specific.h" |
#include "base/macros.h" |
#include "base/memory/ref_counted.h" |
-#include "base/memory/scoped_ptr.h" |
#include "remoting/protocol/authenticator.h" |
#include "remoting/protocol/third_party_host_authenticator.h" |
#include "remoting/protocol/token_validator.h" |
@@ -26,7 +26,7 @@ class PairingRegistry; |
class Me2MeHostAuthenticatorFactory : public AuthenticatorFactory { |
public: |
// Create a factory that dispenses shared secret authenticators. |
- static scoped_ptr<AuthenticatorFactory> CreateWithPin( |
+ static std::unique_ptr<AuthenticatorFactory> CreateWithPin( |
bool use_service_account, |
const std::string& host_owner, |
const std::string& local_cert, |
@@ -36,7 +36,7 @@ class Me2MeHostAuthenticatorFactory : public AuthenticatorFactory { |
scoped_refptr<PairingRegistry> pairing_registry); |
// Create a factory that dispenses third party authenticators. |
- static scoped_ptr<AuthenticatorFactory> CreateWithThirdPartyAuth( |
+ static std::unique_ptr<AuthenticatorFactory> CreateWithThirdPartyAuth( |
bool use_service_account, |
const std::string& host_owner, |
const std::string& local_cert, |
@@ -48,7 +48,7 @@ class Me2MeHostAuthenticatorFactory : public AuthenticatorFactory { |
~Me2MeHostAuthenticatorFactory() override; |
// AuthenticatorFactory interface. |
- scoped_ptr<Authenticator> CreateAuthenticator( |
+ std::unique_ptr<Authenticator> CreateAuthenticator( |
const std::string& local_jid, |
const std::string& remote_jid) override; |