More minor improvements to BaseChannel/transport code.

More minor improvements to BaseChannel/transport code.

Mostly from late comments on this CL:
https://codereview.webrtc.org/2614263002/

Changes SetTransport to DCHECK instead of returning false.
Renames it to SetTransports.
Fixes some possible transport resource leaks.

BUG=None

Review-Url: https://codereview.webrtc.org/2637503003
Cr-Commit-Position: refs/heads/master@{#16130}
Committed: https://chromium.googlesource.com/external/webrtc/+/bad5dadef3cf90d8ba081e7f814e913ecd2ff83d

[Taylor Brandstetter, 2017-01-13 23:47:02]

deadbeef@webrtc.org changed reviewers:
+ pthatcher@webrtc.org

[Zhi Huang, 2017-01-16 01:51:06]

On 2017/01/13 23:47:03, Taylor Brandstetter wrote:

Thanks for making this CL.

[Zhi Huang, 2017-01-16 01:51:49]

zhihuang@webrtc.org changed reviewers:
+ zhihuang@webrtc.org

[Zhi Huang, 2017-01-16 01:51:50]

https://codereview.webrtc.org/2637503003/diff/1/webrtc/pc/channel.h
File webrtc/pc/channel.h (right):

https://codereview.webrtc.org/2637503003/diff/1/webrtc/pc/channel.h#newcode203
webrtc/pc/channel.h:203: void SetTransport_n(TransportChannel* rtp_transport,
"SetTransports_n" as well?

[Taylor Brandstetter, 2017-01-16 11:44:08]

https://codereview.webrtc.org/2637503003/diff/1/webrtc/pc/channel.h
File webrtc/pc/channel.h (right):

https://codereview.webrtc.org/2637503003/diff/1/webrtc/pc/channel.h#newcode203
webrtc/pc/channel.h:203: void SetTransport_n(TransportChannel* rtp_transport,
On 2017/01/16 01:51:50, Zhi Huang wrote:
> "SetTransports_n" as well?

Done.

[pthatcher1, 2017-01-17 19:37:23]

lgtm

[Taylor Brandstetter, 2017-01-17 22:53:03]

The CQ bit was checked by deadbeef@webrtc.org

[commit-bot: I haz the power, 2017-01-17 22:53:11]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.webrtc.org/...

[commit-bot: I haz the power, 2017-01-18 01:16:54]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-01-18 01:16:55]

Failed to apply patch for webrtc/api/rtcstatscollector_unittest.cc:
While running git apply --index -p1;
  error: patch failed: webrtc/api/rtcstatscollector_unittest.cc:1444
  error: webrtc/api/rtcstatscollector_unittest.cc: patch does not apply

Patch:       webrtc/api/rtcstatscollector_unittest.cc
Index: webrtc/api/rtcstatscollector_unittest.cc
diff --git a/webrtc/api/rtcstatscollector_unittest.cc
b/webrtc/api/rtcstatscollector_unittest.cc
index
a9426622fb391cddbe54edf32b9ef4a9724a235e..81a56d1c387f09d7f749dfa8f2519c277e63939c
100644
--- a/webrtc/api/rtcstatscollector_unittest.cc
+++ b/webrtc/api/rtcstatscollector_unittest.cc
@@ -293,11 +293,11 @@ class RTCStatsCollectorTestHelper : public
SetSessionDescriptionObserver {
   RTCStatsCollectorTestHelper()
       : worker_thread_(rtc::Thread::Current()),
         network_thread_(rtc::Thread::Current()),
+        signaling_thread_(rtc::Thread::Current()),
         media_engine_(new cricket::FakeMediaEngine()),
-        channel_manager_(
-            new cricket::ChannelManager(media_engine_,
-                                        worker_thread_,
-                                        network_thread_)),
+        channel_manager_(new cricket::ChannelManager(media_engine_,
+                                                     worker_thread_,
+                                                     network_thread_)),
         media_controller_(
             MediaControllerInterface::Create(cricket::MediaConfig(),
                                              worker_thread_,
@@ -323,6 +323,7 @@ class RTCStatsCollectorTestHelper : public
SetSessionDescriptionObserver {
   rtc::ScopedFakeClock& fake_clock() { return fake_clock_; }
   rtc::Thread* worker_thread() { return worker_thread_; }
   rtc::Thread* network_thread() { return network_thread_; }
+  rtc::Thread* signaling_thread() { return signaling_thread_; }
   cricket::FakeMediaEngine* media_engine() { return media_engine_; }
   MockWebRtcSession& session() { return session_; }
   MockPeerConnection& pc() { return pc_; }
@@ -341,6 +342,7 @@ class RTCStatsCollectorTestHelper : public
SetSessionDescriptionObserver {
   RtcEventLogNullImpl event_log_;
   rtc::Thread* const worker_thread_;
   rtc::Thread* const network_thread_;
+  rtc::Thread* const signaling_thread_;
   cricket::FakeMediaEngine* media_engine_;
   std::unique_ptr<cricket::ChannelManager> channel_manager_;
   std::unique_ptr<MediaControllerInterface> media_controller_;
@@ -596,15 +598,15 @@ TEST_F(RTCStatsCollectorTest,
CollectRTCCertificateStatsSingle) {
 TEST_F(RTCStatsCollectorTest, CollectRTCCodecStats) {
   MockVoiceMediaChannel* voice_media_channel = new MockVoiceMediaChannel();
   cricket::VoiceChannel voice_channel(
-      test_->worker_thread(), test_->network_thread(), nullptr,
-      test_->media_engine(), voice_media_channel, "VoiceContentName",
-      kDefaultRtcpMuxRequired, kDefaultSrtpRequired);
+      test_->worker_thread(), test_->network_thread(),
+      test_->signaling_thread(), test_->media_engine(), voice_media_channel,
+      "VoiceContentName", kDefaultRtcpMuxRequired, kDefaultSrtpRequired);
 
   MockVideoMediaChannel* video_media_channel = new MockVideoMediaChannel();
   cricket::VideoChannel video_channel(
-      test_->worker_thread(), test_->network_thread(), nullptr,
-      video_media_channel, "VideoContentName", kDefaultRtcpMuxRequired,
-      kDefaultSrtpRequired);
+      test_->worker_thread(), test_->network_thread(),
+      test_->signaling_thread(), video_media_channel, "VideoContentName",
+      kDefaultRtcpMuxRequired, kDefaultSrtpRequired);
 
   // Audio
   cricket::VoiceMediaInfo voice_media_info;
@@ -1444,9 +1446,9 @@ TEST_F(RTCStatsCollectorTest,
 TEST_F(RTCStatsCollectorTest, CollectRTCInboundRTPStreamStats_Audio) {
   MockVoiceMediaChannel* voice_media_channel = new MockVoiceMediaChannel();
   cricket::VoiceChannel voice_channel(
-      test_->worker_thread(), test_->network_thread(), nullptr,
-      test_->media_engine(), voice_media_channel, "VoiceContentName",
-      kDefaultRtcpMuxRequired, kDefaultSrtpRequired);
+      test_->worker_thread(), test_->network_thread(),
+      test_->signaling_thread(), test_->media_engine(), voice_media_channel,
+      "VoiceContentName", kDefaultRtcpMuxRequired, kDefaultSrtpRequired);
 
   cricket::VoiceMediaInfo voice_media_info;
 
@@ -1517,9 +1519,9 @@ TEST_F(RTCStatsCollectorTest,
CollectRTCInboundRTPStreamStats_Audio) {
 TEST_F(RTCStatsCollectorTest, CollectRTCInboundRTPStreamStats_Video) {
   MockVideoMediaChannel* video_media_channel = new MockVideoMediaChannel();
   cricket::VideoChannel video_channel(
-      test_->worker_thread(), test_->network_thread(), nullptr,
-      video_media_channel, "VideoContentName", kDefaultRtcpMuxRequired,
-      kDefaultSrtpRequired);
+      test_->worker_thread(), test_->network_thread(),
+      test_->signaling_thread(), video_media_channel, "VideoContentName",
+      kDefaultRtcpMuxRequired, kDefaultSrtpRequired);
 
   cricket::VideoMediaInfo video_media_info;
 
@@ -1596,9 +1598,9 @@ TEST_F(RTCStatsCollectorTest,
CollectRTCInboundRTPStreamStats_Video) {
 TEST_F(RTCStatsCollectorTest, CollectRTCOutboundRTPStreamStats_Audio) {
   MockVoiceMediaChannel* voice_media_channel = new MockVoiceMediaChannel();
   cricket::VoiceChannel voice_channel(
-      test_->worker_thread(), test_->network_thread(), nullptr,
-      test_->media_engine(), voice_media_channel, "VoiceContentName",
-      kDefaultRtcpMuxRequired, kDefaultSrtpRequired);
+      test_->worker_thread(), test_->network_thread(),
+      test_->signaling_thread(), test_->media_engine(), voice_media_channel,
+      "VoiceContentName", kDefaultRtcpMuxRequired, kDefaultSrtpRequired);
 
   cricket::VoiceMediaInfo voice_media_info;
 
@@ -1664,9 +1666,9 @@ TEST_F(RTCStatsCollectorTest,
CollectRTCOutboundRTPStreamStats_Audio) {
 TEST_F(RTCStatsCollectorTest, CollectRTCOutboundRTPStreamStats_Video) {
   MockVideoMediaChannel* video_media_channel = new MockVideoMediaChannel();
   cricket::VideoChannel video_channel(
-      test_->worker_thread(), test_->network_thread(), nullptr,
-      video_media_channel, "VideoContentName", kDefaultRtcpMuxRequired,
-      kDefaultSrtpRequired);
+      test_->worker_thread(), test_->network_thread(),
+      test_->signaling_thread(), video_media_channel, "VideoContentName",
+      kDefaultRtcpMuxRequired, kDefaultSrtpRequired);
 
   cricket::VideoMediaInfo video_media_info;
 
@@ -1742,14 +1744,14 @@ TEST_F(RTCStatsCollectorTest,
CollectRTCOutboundRTPStreamStats_Video) {
 TEST_F(RTCStatsCollectorTest, CollectRTCOutboundRTPStreamStats_Default) {
   MockVoiceMediaChannel* voice_media_channel = new MockVoiceMediaChannel();
   cricket::VoiceChannel voice_channel(
-      test_->worker_thread(), test_->network_thread(), nullptr,
-      test_->media_engine(), voice_media_channel, "VoiceContentName",
-      kDefaultRtcpMuxRequired, kDefaultSrtpRequired);
+      test_->worker_thread(), test_->network_thread(),
+      test_->signaling_thread(), test_->media_engine(), voice_media_channel,
+      "VoiceContentName", kDefaultRtcpMuxRequired, kDefaultSrtpRequired);
   MockVideoMediaChannel* video_media_channel = new MockVideoMediaChannel();
   cricket::VideoChannel video_channel(
-      test_->worker_thread(), test_->network_thread(), nullptr,
-      video_media_channel, "VideoContentName", kDefaultRtcpMuxRequired,
-      kDefaultSrtpRequired);
+      test_->worker_thread(), test_->network_thread(),
+      test_->signaling_thread(), video_media_channel, "VideoContentName",
+      kDefaultRtcpMuxRequired, kDefaultSrtpRequired);
 
   cricket::VoiceMediaInfo voice_media_info;
   voice_media_info.senders.push_back(cricket::VoiceSenderInfo());

[Taylor Brandstetter, 2017-01-18 01:19:28]

The CQ bit was checked by deadbeef@webrtc.org

[Taylor Brandstetter, 2017-01-18 01:19:29]

The patchset sent to the CQ was uploaded after l-g-t-m from pthatcher@webrtc.org
Link to the patchset: https://codereview.webrtc.org/2637503003/#ps40001 (title:
"Merge with master")

[commit-bot: I haz the power, 2017-01-18 01:19:38]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.webrtc.org/...

[commit-bot: I haz the power, 2017-01-18 02:32:36]

CQ is committing da patch.

Bot data: {"patchset_id": 40001, "attempt_start_ts": 1484702368836690,
"parent_rev": "b308b037e3916cc7cacb300fa89553fabceda326", "commit_rev":
"bad5dadef3cf90d8ba081e7f814e913ecd2ff83d"}

[commit-bot: I haz the power, 2017-01-18 02:32:39]

Description was changed from

==========
More minor improvements to BaseChannel/transport code.

Mostly from late comments on this CL:
https://codereview.webrtc.org/2614263002/

Changes SetTransport to DCHECK instead of returning false.
Renames it to SetTransports.
Fixes some possible transport resource leaks.

BUG=None
==========

to

==========
More minor improvements to BaseChannel/transport code.

Mostly from late comments on this CL:
https://codereview.webrtc.org/2614263002/

Changes SetTransport to DCHECK instead of returning false.
Renames it to SetTransports.
Fixes some possible transport resource leaks.

BUG=None

Review-Url: https://codereview.webrtc.org/2637503003
Cr-Commit-Position: refs/heads/master@{#16130}
Committed:
https://chromium.googlesource.com/external/webrtc/+/bad5dadef3cf90d8ba081e7f8...
==========

[commit-bot: I haz the power, 2017-01-18 02:32:40]

Committed patchset #3 (id:40001) as
https://chromium.googlesource.com/external/webrtc/+/bad5dadef3cf90d8ba081e7f8...