| Index: remoting/host/register_support_host_request_unittest.cc
|
| diff --git a/remoting/host/register_support_host_request_unittest.cc b/remoting/host/register_support_host_request_unittest.cc
|
| index 3278345bf847291824923808e5e3b76b6923e28b..0f94b44b1afeb46e6ff4d6717c5ef5a019c1f807 100644
|
| --- a/remoting/host/register_support_host_request_unittest.cc
|
| +++ b/remoting/host/register_support_host_request_unittest.cc
|
| @@ -85,7 +85,7 @@ TEST_F(RegisterSupportHostRequestTest, Send) {
|
| base::Bind(&MockCallback::OnResponse,
|
| base::Unretained(&callback_))));
|
|
|
| - XmlElement* sent_iq = NULL;
|
| + XmlElement* sent_iq = nullptr;
|
| EXPECT_CALL(signal_strategy_, GetNextId())
|
| .WillOnce(Return(kStanzaId));
|
| EXPECT_CALL(signal_strategy_, SendStanzaPtr(NotNull()))
|
| @@ -96,7 +96,7 @@ TEST_F(RegisterSupportHostRequestTest, Send) {
|
|
|
| // Verify format of the query.
|
| scoped_ptr<XmlElement> stanza(sent_iq);
|
| - ASSERT_TRUE(stanza != NULL);
|
| + ASSERT_TRUE(stanza != nullptr);
|
|
|
| EXPECT_EQ(stanza->Attr(buzz::QName(std::string(), "to")),
|
| std::string(kTestBotJid));
|
| @@ -107,8 +107,8 @@ TEST_F(RegisterSupportHostRequestTest, Send) {
|
|
|
| QName signature_tag(kChromotingXmlNamespace, "signature");
|
| XmlElement* signature = stanza->FirstElement()->FirstNamed(signature_tag);
|
| - ASSERT_TRUE(signature != NULL);
|
| - EXPECT_TRUE(stanza->NextNamed(signature_tag) == NULL);
|
| + ASSERT_TRUE(signature != nullptr);
|
| + EXPECT_TRUE(stanza->NextNamed(signature_tag) == nullptr);
|
|
|
| std::string time_str =
|
| signature->Attr(QName(kChromotingXmlNamespace, "time"));
|
| @@ -152,7 +152,7 @@ TEST_F(RegisterSupportHostRequestTest, Send) {
|
| ObserverListBase<SignalStrategy::Listener>::Iterator it(
|
| signal_strategy_listeners_);
|
| SignalStrategy::Listener* listener;
|
| - while ((listener = it.GetNext()) != NULL) {
|
| + while ((listener = it.GetNext()) != nullptr) {
|
| if (listener->OnSignalStrategyIncomingStanza(response.get()))
|
| consumed++;
|
| }
|
|
|