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

Unified Diff: remoting/protocol/authenticator_test_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
« no previous file with comments | « remoting/protocol/authenticator.cc ('k') | remoting/protocol/authenticator_test_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/authenticator_test_base.h
diff --git a/remoting/protocol/authenticator_test_base.h b/remoting/protocol/authenticator_test_base.h
index e915423492296b63a3c98840256f4f27e053539f..16b4a14bac95507fef6c617fc52f04be45dae25b 100644
--- a/remoting/protocol/authenticator_test_base.h
+++ b/remoting/protocol/authenticator_test_base.h
@@ -5,11 +5,11 @@
#ifndef REMOTING_PROTOCOL_AUTHENTICATOR_TEST_BASE_H_
#define REMOTING_PROTOCOL_AUTHENTICATOR_TEST_BASE_H_
+#include <memory>
#include <string>
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_loop.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -47,26 +47,24 @@ class AuthenticatorTestBase : public testing::Test {
void RunHostInitiatedAuthExchange();
void RunChannelAuth(bool expected_fail);
- void OnHostConnected(int error,
- scoped_ptr<P2PStreamSocket> socket);
- void OnClientConnected(int error,
- scoped_ptr<P2PStreamSocket> socket);
+ void OnHostConnected(int error, std::unique_ptr<P2PStreamSocket> socket);
+ void OnClientConnected(int error, std::unique_ptr<P2PStreamSocket> socket);
base::MessageLoop message_loop_;
scoped_refptr<RsaKeyPair> key_pair_;
std::string host_public_key_;
std::string host_cert_;
- scoped_ptr<Authenticator> host_;
- scoped_ptr<Authenticator> client_;
- scoped_ptr<FakeStreamSocket> client_fake_socket_;
- scoped_ptr<FakeStreamSocket> host_fake_socket_;
- scoped_ptr<ChannelAuthenticator> client_auth_;
- scoped_ptr<ChannelAuthenticator> host_auth_;
+ std::unique_ptr<Authenticator> host_;
+ std::unique_ptr<Authenticator> client_;
+ std::unique_ptr<FakeStreamSocket> client_fake_socket_;
+ std::unique_ptr<FakeStreamSocket> host_fake_socket_;
+ std::unique_ptr<ChannelAuthenticator> client_auth_;
+ std::unique_ptr<ChannelAuthenticator> host_auth_;
MockChannelDoneCallback client_callback_;
MockChannelDoneCallback host_callback_;
- scoped_ptr<P2PStreamSocket> client_socket_;
- scoped_ptr<P2PStreamSocket> host_socket_;
+ std::unique_ptr<P2PStreamSocket> client_socket_;
+ std::unique_ptr<P2PStreamSocket> host_socket_;
DISALLOW_COPY_AND_ASSIGN(AuthenticatorTestBase);
};
« no previous file with comments | « remoting/protocol/authenticator.cc ('k') | remoting/protocol/authenticator_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698