commit 2b4ce3a501b8d679f84c1ad10317dea5c78fa595
author pbos@webrtc.org <pbos@webrtc.org> Mon Mar 23 13:12:24 2015
committer pbos@webrtc.org <pbos@webrtc.org> Mon Mar 23 13:13:15 2015
tree bccde979fe377437566bda7532e1ff6625a5b28d
parent 41d2befe9f34ba8706dbf0d2d3ede54af761b5bf

Convert webrtc/video/ abort/assert to CHECK/DCHECK.

Also replaces NULL with nullptr. This gives nicer error messages and
keeps style consistent.

BUG=1756
R=magjed@webrtc.org, stefan@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/42879004

Cr-Commit-Position: refs/heads/master@{#8831}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8831 4adac7df-926f-26a2-2b94-8c16560cd09d

webrtc/video/bitrate_estimator_tests.cc

diff --git a/webrtc/video/bitrate_estimator_tests.cc b/webrtc/video/bitrate_estimator_tests.cc
index bf0f1af..c968b71 100644
--- a/webrtc/video/bitrate_estimator_tests.cc
+++ b/webrtc/video/bitrate_estimator_tests.cc
@@ -13,6 +13,7 @@
 
 #include "testing/gtest/include/gtest/gtest.h"
 
+#include "webrtc/base/checks.h"
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/base/thread_annotations.h"
 #include "webrtc/call.h"
@@ -48,7 +49,7 @@
   }
 
   ~TraceObserver() {
-    Trace::SetTraceCallback(NULL);
+    Trace::SetTraceCallback(nullptr);
     Trace::ReturnTrace();
   }
 
@@ -143,7 +144,7 @@
     send_config_ = VideoSendStream::Config();
     send_config_.rtp.ssrcs.push_back(kSendSsrcs[0]);
     // Encoders will be set separately per stream.
-    send_config_.encoder_settings.encoder = NULL;
+    send_config_.encoder_settings.encoder = nullptr;
     send_config_.encoder_settings.payload_name = "FAKE";
     send_config_.encoder_settings.payload_type = kFakeSendPayloadType;
     encoder_config_.streams = test::CreateVideoStreams(1);
@@ -181,8 +182,8 @@
     explicit Stream(BitrateEstimatorTest* test)
         : test_(test),
           is_sending_receiving_(false),
-          send_stream_(NULL),
-          receive_stream_(NULL),
+          send_stream_(nullptr),
+          receive_stream_(nullptr),
           frame_generator_capturer_(),
           fake_encoder_(Clock::GetRealTimeClock()),
           fake_decoder_() {
@@ -190,7 +191,7 @@
       test_->send_config_.encoder_settings.encoder = &fake_encoder_;
       send_stream_ = test_->sender_call_->CreateVideoSendStream(
           test_->send_config_, test_->encoder_config_);
-      assert(test_->encoder_config_.streams.size() == 1);
+      DCHECK_EQ(1u, test_->encoder_config_.streams.size());
       frame_generator_capturer_.reset(test::FrameGeneratorCapturer::Create(
           send_stream_->Input(),
           test_->encoder_config_.streams[0].width,
@@ -215,11 +216,11 @@
     }
 
     ~Stream() {
-      frame_generator_capturer_.reset(NULL);
+      frame_generator_capturer_.reset(nullptr);
       test_->sender_call_->DestroyVideoSendStream(send_stream_);
-      send_stream_ = NULL;
+      send_stream_ = nullptr;
       test_->receiver_call_->DestroyVideoReceiveStream(receive_stream_);
-      receive_stream_ = NULL;
+      receive_stream_ = nullptr;
     }
 
     void StopSending() {