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

Unified Diff: remoting/protocol/chromium_socket_factory_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/chromium_socket_factory.cc ('k') | remoting/protocol/client_control_dispatcher.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/chromium_socket_factory_unittest.cc
diff --git a/remoting/protocol/chromium_socket_factory_unittest.cc b/remoting/protocol/chromium_socket_factory_unittest.cc
index d1b8a9cc3ee6c433c9b2068f1ae506c57ac96a38..1f13109954d613b985dbd96f3dba0fa2d76ece6e 100644
--- a/remoting/protocol/chromium_socket_factory_unittest.cc
+++ b/remoting/protocol/chromium_socket_factory_unittest.cc
@@ -22,7 +22,7 @@ class ChromiumSocketFactoryTest : public testing::Test,
socket_.reset(socket_factory_->CreateUdpSocket(
rtc::SocketAddress("127.0.0.1", 0), 0, 0));
- ASSERT_TRUE(socket_.get() != NULL);
+ ASSERT_TRUE(socket_.get() != nullptr);
EXPECT_EQ(socket_->GetState(), rtc::AsyncPacketSocket::STATE_BOUND);
socket_->SignalReadPacket.connect(
this, &ChromiumSocketFactoryTest::OnPacket);
@@ -71,7 +71,7 @@ TEST_F(ChromiumSocketFactoryTest, SendAndReceive) {
scoped_ptr<rtc::AsyncPacketSocket> sending_socket(
socket_factory_->CreateUdpSocket(
rtc::SocketAddress("127.0.0.1", 0), 0, 0));
- ASSERT_TRUE(sending_socket.get() != NULL);
+ ASSERT_TRUE(sending_socket.get() != nullptr);
EXPECT_EQ(sending_socket->GetState(),
rtc::AsyncPacketSocket::STATE_BOUND);
@@ -88,7 +88,7 @@ TEST_F(ChromiumSocketFactoryTest, PortRange) {
const uint16 kMaxPort = 12410;
socket_.reset(socket_factory_->CreateUdpSocket(
rtc::SocketAddress("127.0.0.1", 0), kMaxPort, kMaxPort));
- ASSERT_TRUE(socket_.get() != NULL);
+ ASSERT_TRUE(socket_.get() != nullptr);
EXPECT_EQ(socket_->GetState(), rtc::AsyncPacketSocket::STATE_BOUND);
EXPECT_GE(socket_->GetLocalAddress().port(), kMinPort);
EXPECT_LE(socket_->GetLocalAddress().port(), kMaxPort);
« no previous file with comments | « remoting/protocol/chromium_socket_factory.cc ('k') | remoting/protocol/client_control_dispatcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698