Index: extensions/browser/api/cast_channel/logger_unittest.cc |
diff --git a/extensions/browser/api/cast_channel/logger_unittest.cc b/extensions/browser/api/cast_channel/logger_unittest.cc |
index 3d1f964e42f585adfdee67fd8543fa8d0639dd2c..371f41042e1308046055b36e41ed07a7e5394e01 100644 |
--- a/extensions/browser/api/cast_channel/logger_unittest.cc |
+++ b/extensions/browser/api/cast_channel/logger_unittest.cc |
@@ -30,7 +30,7 @@ class CastChannelLoggerTest : public testing::Test { |
virtual ~CastChannelLoggerTest() {} |
bool Uncompress(const char* input, int length, std::string* output) { |
- z_stream stream = {0}; |
+ z_stream stream = {nullptr}; |
stream.next_in = reinterpret_cast<uint8*>(const_cast<char*>(input)); |
stream.avail_in = length; |
@@ -118,7 +118,7 @@ TEST_F(CastChannelLoggerTest, BasicLogging) { |
EXPECT_EQ(last_errors.nss_error_code, kTestNssErrorCode); |
scoped_ptr<Log> log = GetLog(); |
- ASSERT_TRUE(log.get() != NULL); |
+ ASSERT_TRUE(log.get() != nullptr); |
ASSERT_EQ(2, log->aggregated_socket_event_size()); |
{ |
@@ -200,7 +200,7 @@ TEST_F(CastChannelLoggerTest, LogSocketReadWrite) { |
clock_->Advance(base::TimeDelta::FromMicroseconds(1)); |
scoped_ptr<Log> log = GetLog(); |
- ASSERT_TRUE(log.get() != NULL); |
+ ASSERT_TRUE(log.get() != nullptr); |
ASSERT_EQ(2, log->aggregated_socket_event_size()); |
{ |
@@ -227,7 +227,7 @@ TEST_F(CastChannelLoggerTest, TooManySockets) { |
} |
scoped_ptr<Log> log = GetLog(); |
- ASSERT_TRUE(log.get() != NULL); |
+ ASSERT_TRUE(log.get() != nullptr); |
ASSERT_EQ(kMaxSocketsToLog, log->aggregated_socket_event_size()); |
EXPECT_EQ(5, log->num_evicted_aggregated_socket_events()); |
@@ -245,7 +245,7 @@ TEST_F(CastChannelLoggerTest, TooManyEvents) { |
} |
scoped_ptr<Log> log = GetLog(); |
- ASSERT_TRUE(log.get() != NULL); |
+ ASSERT_TRUE(log.get() != nullptr); |
ASSERT_EQ(1, log->aggregated_socket_event_size()); |
EXPECT_EQ(0, log->num_evicted_aggregated_socket_events()); |
@@ -261,14 +261,14 @@ TEST_F(CastChannelLoggerTest, Reset) { |
logger_->LogSocketEvent(1, EventType::CAST_SOCKET_CREATED); |
scoped_ptr<Log> log = GetLog(); |
- ASSERT_TRUE(log.get() != NULL); |
+ ASSERT_TRUE(log.get() != nullptr); |
EXPECT_EQ(1, log->aggregated_socket_event_size()); |
logger_->Reset(); |
log = GetLog(); |
- ASSERT_TRUE(log.get() != NULL); |
+ ASSERT_TRUE(log.get() != nullptr); |
EXPECT_EQ(0, log->aggregated_socket_event_size()); |
} |