| Index: base/tracked_objects_unittest.cc
|
| diff --git a/base/tracked_objects_unittest.cc b/base/tracked_objects_unittest.cc
|
| index cdbf9ac7a6cec99f91e6a3c241b528c9b1c66113..09d7653330aef897a2f51912e660fed4edcb563b 100644
|
| --- a/base/tracked_objects_unittest.cc
|
| +++ b/base/tracked_objects_unittest.cc
|
| @@ -240,7 +240,7 @@ TEST_F(TrackedObjectsTest, DeathDataTestRecordDeath) {
|
| ThreadData::InitializeAndSetTrackingStatus(ThreadData::PROFILING_ACTIVE);
|
|
|
| scoped_ptr<DeathData> data(new DeathData());
|
| - ASSERT_NE(data, reinterpret_cast<DeathData*>(NULL));
|
| + ASSERT_NE(data, nullptr);
|
| EXPECT_EQ(data->run_duration_sum(), 0);
|
| EXPECT_EQ(data->run_duration_max(), 0);
|
| EXPECT_EQ(data->run_duration_sample(), 0);
|
| @@ -279,7 +279,7 @@ TEST_F(TrackedObjectsTest, DeathDataTest2Phases) {
|
| ThreadData::InitializeAndSetTrackingStatus(ThreadData::PROFILING_ACTIVE);
|
|
|
| scoped_ptr<DeathData> data(new DeathData());
|
| - ASSERT_NE(data, reinterpret_cast<DeathData*>(NULL));
|
| + ASSERT_NE(data, nullptr);
|
|
|
| int32 run_ms = 42;
|
| int32 queue_ms = 8;
|
|
|