Index: webrtc/modules/rtp_rtcp/source/vp8_partition_aggregator_unittest.cc |
diff --git a/webrtc/modules/rtp_rtcp/source/vp8_partition_aggregator_unittest.cc b/webrtc/modules/rtp_rtcp/source/vp8_partition_aggregator_unittest.cc |
index 6413d60fc0c6dca96ad5751fbb642c0bf80c7757..006b5e6e68b9e406623258d75f337c3ec1cca0db 100644 |
--- a/webrtc/modules/rtp_rtcp/source/vp8_partition_aggregator_unittest.cc |
+++ b/webrtc/modules/rtp_rtcp/source/vp8_partition_aggregator_unittest.cc |
@@ -8,7 +8,7 @@ |
* be found in the AUTHORS file in the root of the source tree. |
*/ |
-#include <stdlib.h> // NULL |
+#include <stdlib.h> // nullptr |
#include "webrtc/modules/rtp_rtcp/source/vp8_partition_aggregator.h" |
#include "webrtc/test/gtest.h" |
@@ -34,8 +34,8 @@ TEST(PartitionTreeNode, CreateChildrenAndDelete) { |
PartitionTreeNode* root = |
PartitionTreeNode::CreateRootNode(kVector, kNumPartitions); |
EXPECT_TRUE(root->CreateChildren(kMaxSize)); |
- ASSERT_TRUE(NULL != root->left_child()); |
- ASSERT_TRUE(NULL != root->right_child()); |
+ ASSERT_TRUE(nullptr != root->left_child()); |
+ ASSERT_TRUE(nullptr != root->right_child()); |
EXPECT_EQ(3u, root->left_child()->this_size()); |
EXPECT_EQ(2u, root->right_child()->this_size()); |
EXPECT_EQ(11, root->right_child()->Cost(kPenalty)); |
@@ -54,7 +54,7 @@ TEST(PartitionTreeNode, FindOptimalConfig) { |
root->set_max_parent_size(500); |
root->set_min_parent_size(300); |
PartitionTreeNode* opt = root->GetOptimalNode(kMaxSize, kPenalty); |
- ASSERT_TRUE(opt != NULL); |
+ ASSERT_TRUE(opt != nullptr); |
EXPECT_EQ(4u, opt->NumPackets()); |
// Expect optimal sequence to be {1, 0, 1, 0, 1, 0, 1, 0}, which corresponds |
// to (right)-left-right-left-right-left-right-left, where the root node is |
@@ -83,7 +83,7 @@ TEST(PartitionTreeNode, FindOptimalConfigSinglePartition) { |
PartitionTreeNode* root = |
PartitionTreeNode::CreateRootNode(kVector, kNumPartitions); |
PartitionTreeNode* opt = root->GetOptimalNode(kMaxSize, kPenalty); |
- ASSERT_TRUE(opt != NULL); |
+ ASSERT_TRUE(opt != nullptr); |
EXPECT_EQ(1u, opt->NumPackets()); |
EXPECT_TRUE(opt == root); |
delete root; |