| Index: webrtc/modules/video_capture/test/video_capture_unittest.cc
|
| diff --git a/webrtc/modules/video_capture/test/video_capture_unittest.cc b/webrtc/modules/video_capture/test/video_capture_unittest.cc
|
| index d0c3ec9b257981c351e4536ca1e02ebec95174fa..5ae36be4f0e162a754a64b0befe46fe09ce21efe 100644
|
| --- a/webrtc/modules/video_capture/test/video_capture_unittest.cc
|
| +++ b/webrtc/modules/video_capture/test/video_capture_unittest.cc
|
| @@ -169,8 +169,8 @@ class VideoCaptureTest : public testing::Test {
|
|
|
| rtc::scoped_refptr<VideoCaptureModule> module(
|
| VideoCaptureFactory::Create(unique_name));
|
| - if (module.get() == NULL)
|
| - return NULL;
|
| + if (module.get() == nullptr)
|
| + return nullptr;
|
|
|
| EXPECT_FALSE(module->CaptureStarted());
|
|
|
| @@ -206,7 +206,7 @@ TEST_F(VideoCaptureTest, MAYBE_CreateDelete) {
|
| TestVideoCaptureCallback capture_observer;
|
| rtc::scoped_refptr<VideoCaptureModule> module(
|
| OpenVideoCaptureDevice(0, &capture_observer));
|
| - ASSERT_TRUE(module.get() != NULL);
|
| + ASSERT_TRUE(module.get() != nullptr);
|
|
|
| VideoCaptureCapability capability;
|
| #ifndef WEBRTC_MAC
|
| @@ -252,7 +252,7 @@ TEST_F(VideoCaptureTest, MAYBE_Capabilities) {
|
|
|
| rtc::scoped_refptr<VideoCaptureModule> module(
|
| OpenVideoCaptureDevice(0, &capture_observer));
|
| - ASSERT_TRUE(module.get() != NULL);
|
| + ASSERT_TRUE(module.get() != nullptr);
|
|
|
| int number_of_capabilities = device_info_->NumberOfCapabilities(
|
| module->CurrentDeviceName());
|
| @@ -314,7 +314,7 @@ TEST_F(VideoCaptureTest, DISABLED_TestTwoCameras) {
|
| TestVideoCaptureCallback capture_observer1;
|
| rtc::scoped_refptr<VideoCaptureModule> module1(
|
| OpenVideoCaptureDevice(0, &capture_observer1));
|
| - ASSERT_TRUE(module1.get() != NULL);
|
| + ASSERT_TRUE(module1.get() != nullptr);
|
| VideoCaptureCapability capability1;
|
| #ifndef WEBRTC_MAC
|
| device_info_->GetCapability(module1->CurrentDeviceName(), 0, capability1);
|
| @@ -329,8 +329,7 @@ TEST_F(VideoCaptureTest, DISABLED_TestTwoCameras) {
|
| TestVideoCaptureCallback capture_observer2;
|
| rtc::scoped_refptr<VideoCaptureModule> module2(
|
| OpenVideoCaptureDevice(1, &capture_observer2));
|
| - ASSERT_TRUE(module1.get() != NULL);
|
| -
|
| + ASSERT_TRUE(module1.get() != nullptr);
|
|
|
| VideoCaptureCapability capability2;
|
| #ifndef WEBRTC_MAC
|
|
|