| Index: webrtc/media/engine/webrtcvideocapturer_unittest.cc
|
| diff --git a/webrtc/media/engine/webrtcvideocapturer_unittest.cc b/webrtc/media/engine/webrtcvideocapturer_unittest.cc
|
| index 32dab9b22f1faf45f73e453a2c6eec5dd9dfed8b..90ac7d1697eef208fe5197276bf44768c1241df4 100644
|
| --- a/webrtc/media/engine/webrtcvideocapturer_unittest.cc
|
| +++ b/webrtc/media/engine/webrtcvideocapturer_unittest.cc
|
| @@ -54,7 +54,7 @@ class WebRtcVideoCapturerTest : public testing::Test {
|
| TEST_F(WebRtcVideoCapturerTest, TestNotOpened) {
|
| EXPECT_EQ("", capturer_->GetId());
|
| EXPECT_TRUE(capturer_->GetSupportedFormats()->empty());
|
| - EXPECT_TRUE(capturer_->GetCaptureFormat() == NULL);
|
| + EXPECT_TRUE(capturer_->GetCaptureFormat() == nullptr);
|
| EXPECT_FALSE(capturer_->IsRunning());
|
| }
|
|
|
| @@ -66,11 +66,11 @@ TEST_F(WebRtcVideoCapturerTest, TestBadInit) {
|
| TEST_F(WebRtcVideoCapturerTest, TestInit) {
|
| EXPECT_TRUE(capturer_->Init(cricket::Device(kTestDeviceName, kTestDeviceId)));
|
| EXPECT_EQ(kTestDeviceId, capturer_->GetId());
|
| - EXPECT_TRUE(NULL != capturer_->GetSupportedFormats());
|
| + EXPECT_TRUE(nullptr != capturer_->GetSupportedFormats());
|
| ASSERT_EQ(1U, capturer_->GetSupportedFormats()->size());
|
| EXPECT_EQ(640, (*capturer_->GetSupportedFormats())[0].width);
|
| EXPECT_EQ(480, (*capturer_->GetSupportedFormats())[0].height);
|
| - EXPECT_TRUE(capturer_->GetCaptureFormat() == NULL); // not started yet
|
| + EXPECT_TRUE(capturer_->GetCaptureFormat() == nullptr); // not started yet
|
| EXPECT_FALSE(capturer_->IsRunning());
|
| }
|
|
|
| @@ -86,7 +86,7 @@ TEST_F(WebRtcVideoCapturerTest, TestCapture) {
|
| capturer_->GetSupportedFormats()->at(0));
|
| EXPECT_EQ(cricket::CS_STARTING, capturer_->Start(format));
|
| EXPECT_TRUE(capturer_->IsRunning());
|
| - ASSERT_TRUE(capturer_->GetCaptureFormat() != NULL);
|
| + ASSERT_TRUE(capturer_->GetCaptureFormat() != nullptr);
|
| EXPECT_EQ(format, *capturer_->GetCaptureFormat());
|
| EXPECT_EQ_WAIT(cricket::CS_RUNNING, listener.last_capture_state(), 1000);
|
| factory_->modules[0]->SendFrame(640, 480);
|
| @@ -96,7 +96,7 @@ TEST_F(WebRtcVideoCapturerTest, TestCapture) {
|
| EXPECT_EQ(cricket::CS_FAILED, capturer_->Start(format));
|
| capturer_->Stop();
|
| EXPECT_FALSE(capturer_->IsRunning());
|
| - EXPECT_TRUE(capturer_->GetCaptureFormat() == NULL);
|
| + EXPECT_TRUE(capturer_->GetCaptureFormat() == nullptr);
|
| EXPECT_EQ_WAIT(cricket::CS_STOPPED, listener.last_capture_state(), 1000);
|
| }
|
|
|
| @@ -113,7 +113,7 @@ TEST_F(WebRtcVideoCapturerTest, TestCaptureVcm) {
|
| EXPECT_EQ(cricket::FOURCC_I420, format.fourcc);
|
| EXPECT_EQ(cricket::CS_STARTING, capturer_->Start(format));
|
| EXPECT_TRUE(capturer_->IsRunning());
|
| - ASSERT_TRUE(capturer_->GetCaptureFormat() != NULL);
|
| + ASSERT_TRUE(capturer_->GetCaptureFormat() != nullptr);
|
| EXPECT_EQ(format, *capturer_->GetCaptureFormat());
|
| EXPECT_EQ_WAIT(cricket::CS_RUNNING, listener.last_capture_state(), 1000);
|
| factory_->modules[0]->SendFrame(640, 480);
|
| @@ -123,13 +123,13 @@ TEST_F(WebRtcVideoCapturerTest, TestCaptureVcm) {
|
| EXPECT_EQ(cricket::CS_FAILED, capturer_->Start(format));
|
| capturer_->Stop();
|
| EXPECT_FALSE(capturer_->IsRunning());
|
| - EXPECT_TRUE(capturer_->GetCaptureFormat() == NULL);
|
| + EXPECT_TRUE(capturer_->GetCaptureFormat() == nullptr);
|
| }
|
|
|
| TEST_F(WebRtcVideoCapturerTest, TestCaptureWithoutInit) {
|
| cricket::VideoFormat format;
|
| EXPECT_EQ(cricket::CS_FAILED, capturer_->Start(format));
|
| - EXPECT_TRUE(capturer_->GetCaptureFormat() == NULL);
|
| + EXPECT_TRUE(capturer_->GetCaptureFormat() == nullptr);
|
| EXPECT_FALSE(capturer_->IsRunning());
|
| }
|
|
|
|
|