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

Unified Diff: remoting/protocol/ssl_hmac_channel_authenticator_unittest.cc

Issue 810133003: replace NULL->nullptr in src/remoting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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/ssl_hmac_channel_authenticator.cc ('k') | remoting/protocol/stream_channel_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/ssl_hmac_channel_authenticator_unittest.cc
diff --git a/remoting/protocol/ssl_hmac_channel_authenticator_unittest.cc b/remoting/protocol/ssl_hmac_channel_authenticator_unittest.cc
index e57ae002dc09aa4e6ae9f56a6af0e3783030b160..c0c61f81726d63409b086f15c16bf24ad59aca42 100644
--- a/remoting/protocol/ssl_hmac_channel_authenticator_unittest.cc
+++ b/remoting/protocol/ssl_hmac_channel_authenticator_unittest.cc
@@ -88,9 +88,9 @@ class SslHmacChannelAuthenticatorTest : public testing::Test {
int callback_counter = 2;
if (expected_fail) {
- EXPECT_CALL(client_callback_, OnDone(net::ERR_FAILED, NULL))
+ EXPECT_CALL(client_callback_, OnDone(net::ERR_FAILED, nullptr))
.WillOnce(QuitThreadOnCounter(&callback_counter));
- EXPECT_CALL(host_callback_, OnDone(net::ERR_FAILED, NULL))
+ EXPECT_CALL(host_callback_, OnDone(net::ERR_FAILED, nullptr))
.WillOnce(QuitThreadOnCounter(&callback_counter));
} else {
EXPECT_CALL(client_callback_, OnDone(net::OK, NotNull()))
@@ -151,8 +151,8 @@ TEST_F(SslHmacChannelAuthenticatorTest, SuccessfulAuth) {
RunChannelAuth(false);
- ASSERT_TRUE(client_socket_.get() != NULL);
- ASSERT_TRUE(host_socket_.get() != NULL);
+ ASSERT_TRUE(client_socket_.get() != nullptr);
+ ASSERT_TRUE(host_socket_.get() != nullptr);
StreamConnectionTester tester(host_socket_.get(), client_socket_.get(),
100, 2);
@@ -171,7 +171,7 @@ TEST_F(SslHmacChannelAuthenticatorTest, InvalidChannelSecret) {
RunChannelAuth(true);
- ASSERT_TRUE(host_socket_.get() == NULL);
+ ASSERT_TRUE(host_socket_.get() == nullptr);
}
} // namespace protocol
« no previous file with comments | « remoting/protocol/ssl_hmac_channel_authenticator.cc ('k') | remoting/protocol/stream_channel_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698