Index: webrtc/pc/peerconnectionfactory_unittest.cc |
diff --git a/webrtc/pc/peerconnectionfactory_unittest.cc b/webrtc/pc/peerconnectionfactory_unittest.cc |
index 3fa523e3e710b22932c6c928cb77e5ce2487ac9a..aaed0bdeb6bf48618e4aa24b33a15cfeca021fc3 100644 |
--- a/webrtc/pc/peerconnectionfactory_unittest.cc |
+++ b/webrtc/pc/peerconnectionfactory_unittest.cc |
@@ -98,7 +98,7 @@ class PeerConnectionFactoryTest : public testing::Test { |
rtc::Thread::Current(), rtc::Thread::Current(), rtc::Thread::Current(), |
nullptr, nullptr, nullptr); |
- ASSERT_TRUE(factory_.get() != NULL); |
+ ASSERT_TRUE(factory_.get() != nullptr); |
port_allocator_.reset( |
new cricket::FakePortAllocator(rtc::Thread::Current(), nullptr)); |
raw_port_allocator_ = port_allocator_.get(); |
@@ -173,7 +173,7 @@ TEST_F(PeerConnectionFactoryTest, CreatePCUsingIceServers) { |
rtc::scoped_refptr<PeerConnectionInterface> pc(factory_->CreatePeerConnection( |
config, nullptr, std::move(port_allocator_), std::move(cert_generator), |
&observer_)); |
- ASSERT_TRUE(pc.get() != NULL); |
+ ASSERT_TRUE(pc.get() != nullptr); |
cricket::ServerAddresses stun_servers; |
rtc::SocketAddress stun1("stun.l.google.com", 19302); |
stun_servers.insert(stun1); |
@@ -203,7 +203,7 @@ TEST_F(PeerConnectionFactoryTest, CreatePCUsingIceServersUrls) { |
rtc::scoped_refptr<PeerConnectionInterface> pc(factory_->CreatePeerConnection( |
config, nullptr, std::move(port_allocator_), std::move(cert_generator), |
&observer_)); |
- ASSERT_TRUE(pc.get() != NULL); |
+ ASSERT_TRUE(pc.get() != nullptr); |
cricket::ServerAddresses stun_servers; |
rtc::SocketAddress stun1("stun.l.google.com", 19302); |
stun_servers.insert(stun1); |
@@ -232,7 +232,7 @@ TEST_F(PeerConnectionFactoryTest, CreatePCUsingNoUsernameInUri) { |
rtc::scoped_refptr<PeerConnectionInterface> pc(factory_->CreatePeerConnection( |
config, nullptr, std::move(port_allocator_), std::move(cert_generator), |
&observer_)); |
- ASSERT_TRUE(pc.get() != NULL); |
+ ASSERT_TRUE(pc.get() != nullptr); |
std::vector<cricket::RelayServerConfig> turn_servers; |
cricket::RelayServerConfig turn("test.com", 1234, kTurnUsername, |
kTurnPassword, cricket::PROTO_UDP); |
@@ -253,7 +253,7 @@ TEST_F(PeerConnectionFactoryTest, CreatePCUsingTurnUrlWithTransportParam) { |
rtc::scoped_refptr<PeerConnectionInterface> pc(factory_->CreatePeerConnection( |
config, nullptr, std::move(port_allocator_), std::move(cert_generator), |
&observer_)); |
- ASSERT_TRUE(pc.get() != NULL); |
+ ASSERT_TRUE(pc.get() != nullptr); |
std::vector<cricket::RelayServerConfig> turn_servers; |
cricket::RelayServerConfig turn("hello.com", kDefaultStunPort, "test", |
kTurnPassword, cricket::PROTO_TCP); |
@@ -278,7 +278,7 @@ TEST_F(PeerConnectionFactoryTest, CreatePCUsingSecureTurnUrl) { |
rtc::scoped_refptr<PeerConnectionInterface> pc(factory_->CreatePeerConnection( |
config, nullptr, std::move(port_allocator_), std::move(cert_generator), |
&observer_)); |
- ASSERT_TRUE(pc.get() != NULL); |
+ ASSERT_TRUE(pc.get() != nullptr); |
std::vector<cricket::RelayServerConfig> turn_servers; |
cricket::RelayServerConfig turn1("hello.com", kDefaultStunTlsPort, "test", |
kTurnPassword, cricket::PROTO_TLS); |
@@ -313,7 +313,7 @@ TEST_F(PeerConnectionFactoryTest, CreatePCUsingIPLiteralAddress) { |
rtc::scoped_refptr<PeerConnectionInterface> pc(factory_->CreatePeerConnection( |
config, nullptr, std::move(port_allocator_), std::move(cert_generator), |
&observer_)); |
- ASSERT_TRUE(pc.get() != NULL); |
+ ASSERT_TRUE(pc.get() != nullptr); |
cricket::ServerAddresses stun_servers; |
rtc::SocketAddress stun1("1.2.3.4", 1234); |
stun_servers.insert(stun1); |
@@ -338,11 +338,11 @@ TEST_F(PeerConnectionFactoryTest, LocalRendering) { |
cricket::FakeVideoCapturer* capturer = new cricket::FakeVideoCapturer(); |
// The source take ownership of |capturer|. |
rtc::scoped_refptr<VideoTrackSourceInterface> source( |
- factory_->CreateVideoSource(capturer, NULL)); |
- ASSERT_TRUE(source.get() != NULL); |
+ factory_->CreateVideoSource(capturer, nullptr)); |
+ ASSERT_TRUE(source.get() != nullptr); |
rtc::scoped_refptr<VideoTrackInterface> track( |
factory_->CreateVideoTrack("testlabel", source)); |
- ASSERT_TRUE(track.get() != NULL); |
+ ASSERT_TRUE(track.get() != nullptr); |
FakeVideoTrackRenderer local_renderer(track); |
EXPECT_EQ(0, local_renderer.num_rendered_frames()); |