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

Unified Diff: remoting/host/heartbeat_sender_unittest.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/host/heartbeat_sender.cc ('k') | remoting/host/host_change_notification_listener.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/heartbeat_sender_unittest.cc
diff --git a/remoting/host/heartbeat_sender_unittest.cc b/remoting/host/heartbeat_sender_unittest.cc
index d2f27a5089db0b002ba78315dfcbb0793abc6fd7..9253ac6e2757e35c77118597d5931b3358f80aa3 100644
--- a/remoting/host/heartbeat_sender_unittest.cc
+++ b/remoting/host/heartbeat_sender_unittest.cc
@@ -107,7 +107,7 @@ class HeartbeatSenderTest
MockClosure mock_unknown_host_id_error_callback_;
std::set<SignalStrategy::Listener*> signal_strategy_listeners_;
scoped_refptr<RsaKeyPair> key_pair_;
- scoped_ptr<HeartbeatSender> heartbeat_sender_;
+ std::unique_ptr<HeartbeatSender> heartbeat_sender_;
};
// Call Start() followed by Stop(), and make sure a valid heartbeat is sent.
@@ -125,7 +125,7 @@ TEST_F(HeartbeatSenderTest, DoSendStanza) {
heartbeat_sender_->OnSignalStrategyStateChange(SignalStrategy::CONNECTED);
base::RunLoop().RunUntilIdle();
- scoped_ptr<XmlElement> stanza(sent_iq);
+ std::unique_ptr<XmlElement> stanza(sent_iq);
ASSERT_TRUE(stanza != nullptr);
ValidateHeartbeatStanza(stanza.get(), "0", nullptr);
@@ -149,7 +149,7 @@ TEST_F(HeartbeatSenderTest, DoSendStanzaTwice) {
heartbeat_sender_->OnSignalStrategyStateChange(SignalStrategy::CONNECTED);
base::RunLoop().RunUntilIdle();
- scoped_ptr<XmlElement> stanza(sent_iq);
+ std::unique_ptr<XmlElement> stanza(sent_iq);
ASSERT_TRUE(stanza != nullptr);
ValidateHeartbeatStanza(stanza.get(), "0", nullptr);
@@ -166,7 +166,7 @@ TEST_F(HeartbeatSenderTest, DoSendStanzaTwice) {
heartbeat_sender_->OnSignalStrategyStateChange(SignalStrategy::CONNECTED);
base::RunLoop().RunUntilIdle();
- scoped_ptr<XmlElement> stanza2(sent_iq);
+ std::unique_ptr<XmlElement> stanza2(sent_iq);
ValidateHeartbeatStanza(stanza2.get(), "1", nullptr);
heartbeat_sender_->OnSignalStrategyStateChange(SignalStrategy::DISCONNECTED);
@@ -190,7 +190,7 @@ TEST_F(HeartbeatSenderTest, DoSendStanzaWithExpectedSequenceId) {
heartbeat_sender_->OnSignalStrategyStateChange(SignalStrategy::CONNECTED);
base::RunLoop().RunUntilIdle();
- scoped_ptr<XmlElement> stanza(sent_iq);
+ std::unique_ptr<XmlElement> stanza(sent_iq);
ASSERT_TRUE(stanza != nullptr);
ValidateHeartbeatStanza(stanza.get(), "0", nullptr);
@@ -202,7 +202,7 @@ TEST_F(HeartbeatSenderTest, DoSendStanzaWithExpectedSequenceId) {
EXPECT_CALL(signal_strategy_, SendStanzaPtr(NotNull()))
.WillOnce(DoAll(SaveArg<0>(&sent_iq2), Return(true)));
- scoped_ptr<XmlElement> response(new XmlElement(buzz::QN_IQ));
+ std::unique_ptr<XmlElement> response(new XmlElement(buzz::QN_IQ));
response->AddAttr(QName(std::string(), "type"), "result");
XmlElement* result =
new XmlElement(QName(kChromotingXmlNamespace, "heartbeat-result"));
@@ -215,7 +215,7 @@ TEST_F(HeartbeatSenderTest, DoSendStanzaWithExpectedSequenceId) {
heartbeat_sender_->ProcessResponse(false, nullptr, response.get());
base::RunLoop().RunUntilIdle();
- scoped_ptr<XmlElement> stanza2(sent_iq2);
+ std::unique_ptr<XmlElement> stanza2(sent_iq2);
ASSERT_TRUE(stanza2 != nullptr);
ValidateHeartbeatStanza(stanza2.get(),
base::IntToString(kExpectedSequenceId).c_str(),
@@ -228,7 +228,7 @@ TEST_F(HeartbeatSenderTest, DoSendStanzaWithExpectedSequenceId) {
void HeartbeatSenderTest::ProcessResponseWithInterval(
bool is_offline_heartbeat_response,
int interval) {
- scoped_ptr<XmlElement> response(new XmlElement(buzz::QN_IQ));
+ std::unique_ptr<XmlElement> response(new XmlElement(buzz::QN_IQ));
response->AddAttr(QName(std::string(), "type"), "result");
XmlElement* result = new XmlElement(
@@ -276,7 +276,7 @@ TEST_F(HeartbeatSenderTest, DoSetHostOfflineReason) {
heartbeat_sender_->OnSignalStrategyStateChange(SignalStrategy::CONNECTED);
base::RunLoop().RunUntilIdle();
- scoped_ptr<XmlElement> stanza(sent_iq);
+ std::unique_ptr<XmlElement> stanza(sent_iq);
ASSERT_TRUE(stanza != nullptr);
ValidateHeartbeatStanza(stanza.get(), "0", "test_error");
@@ -346,7 +346,7 @@ TEST_F(HeartbeatSenderTest, HostOsInfo) {
heartbeat_sender_->OnSignalStrategyStateChange(SignalStrategy::CONNECTED);
base::RunLoop().RunUntilIdle();
- scoped_ptr<XmlElement> stanza(sent_iq);
+ std::unique_ptr<XmlElement> stanza(sent_iq);
ASSERT_TRUE(stanza != nullptr);
XmlElement* heartbeat_stanza =
« no previous file with comments | « remoting/host/heartbeat_sender.cc ('k') | remoting/host/host_change_notification_listener.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698