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

Unified Diff: extensions/browser/api/cast_channel/logger_unittest.cc

Issue 598173003: Run clang-modernize -use-nullptr over src/extensions/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
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());
}

Powered by Google App Engine
This is Rietveld 408576698