Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6)

Side by Side Diff: webrtc/pc/channelmanager_unittest.cc

Issue 2685783014: Replace NULL with nullptr in all C++ files. (Closed)
Patch Set: Fixing android. Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright 2008 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2008 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 new cricket::FakeTransportController(ICEROLE_CONTROLLING)) {} 47 new cricket::FakeTransportController(ICEROLE_CONTROLLING)) {}
48 48
49 virtual void SetUp() { 49 virtual void SetUp() {
50 fme_->SetAudioCodecs(MAKE_VECTOR(kAudioCodecs)); 50 fme_->SetAudioCodecs(MAKE_VECTOR(kAudioCodecs));
51 fme_->SetVideoCodecs(MAKE_VECTOR(kVideoCodecs)); 51 fme_->SetVideoCodecs(MAKE_VECTOR(kVideoCodecs));
52 } 52 }
53 53
54 virtual void TearDown() { 54 virtual void TearDown() {
55 delete transport_controller_; 55 delete transport_controller_;
56 delete cm_; 56 delete cm_;
57 cm_ = NULL; 57 cm_ = nullptr;
58 fdme_ = NULL; 58 fdme_ = nullptr;
59 fme_ = NULL; 59 fme_ = nullptr;
60 } 60 }
61 61
62 webrtc::RtcEventLogNullImpl event_log_; 62 webrtc::RtcEventLogNullImpl event_log_;
63 rtc::Thread network_; 63 rtc::Thread network_;
64 rtc::Thread worker_; 64 rtc::Thread worker_;
65 cricket::FakeMediaEngine* fme_; 65 cricket::FakeMediaEngine* fme_;
66 cricket::FakeDataEngine* fdme_; 66 cricket::FakeDataEngine* fdme_;
67 cricket::ChannelManager* cm_; 67 cricket::ChannelManager* cm_;
68 cricket::FakeCall fake_call_; 68 cricket::FakeCall fake_call_;
69 cricket::FakeMediaController fake_mc_; 69 cricket::FakeMediaController fake_mc_;
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 EXPECT_FALSE(cm_->SetVideoRtxEnabled(false)); 184 EXPECT_FALSE(cm_->SetVideoRtxEnabled(false));
185 185
186 // Can set again after terminate. 186 // Can set again after terminate.
187 cm_->Terminate(); 187 cm_->Terminate();
188 EXPECT_TRUE(cm_->SetVideoRtxEnabled(true)); 188 EXPECT_TRUE(cm_->SetVideoRtxEnabled(true));
189 cm_->GetSupportedVideoCodecs(&codecs); 189 cm_->GetSupportedVideoCodecs(&codecs);
190 EXPECT_TRUE(ContainsMatchingCodec(codecs, rtx_codec)); 190 EXPECT_TRUE(ContainsMatchingCodec(codecs, rtx_codec));
191 } 191 }
192 192
193 } // namespace cricket 193 } // namespace cricket
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698