Added network thread to rtc::BaseChannel

webrtc/pc/channelmanager_unittest.cc

 /*
  *  Copyright 2008 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 38 matching lines @@
   }
 
   virtual void TearDown() {
     delete transport_controller_;
     delete cm_;
     cm_ = NULL;
     fdme_ = NULL;
     fme_ = NULL;
   }
 
+  rtc::Thread network_;
   rtc::Thread worker_;
   cricket::FakeMediaEngine* fme_;
   cricket::FakeDataEngine* fdme_;
   cricket::ChannelManager* cm_;
   cricket::FakeCall fake_call_;
   cricket::FakeMediaController fake_mc_;
   cricket::FakeTransportController* transport_controller_;
 };
 
 // Test that we startup/shutdown properly.
 TEST_F(ChannelManagerTest, StartupShutdown) {
   EXPECT_FALSE(cm_->initialized());
   EXPECT_EQ(rtc::Thread::Current(), cm_->worker_thread());
   EXPECT_TRUE(cm_->Init());
   EXPECT_TRUE(cm_->initialized());
   cm_->Terminate();
   EXPECT_FALSE(cm_->initialized());
 }
 
 // Test that we startup/shutdown properly with a worker thread.
 TEST_F(ChannelManagerTest, StartupShutdownOnThread) {
+  network_.Start();
   worker_.Start();
   EXPECT_FALSE(cm_->initialized());
   EXPECT_EQ(rtc::Thread::Current(), cm_->worker_thread());
+  EXPECT_TRUE(cm_->set_network_thread(&network_));
+  EXPECT_EQ(&network_, cm_->network_thread());
   EXPECT_TRUE(cm_->set_worker_thread(&worker_));
   EXPECT_EQ(&worker_, cm_->worker_thread());
   EXPECT_TRUE(cm_->Init());
   EXPECT_TRUE(cm_->initialized());
-  // Setting the worker thread while initialized should fail.
+  // Setting the network or worker thread while initialized should fail.
+  EXPECT_FALSE(cm_->set_network_thread(rtc::Thread::Current()));
   EXPECT_FALSE(cm_->set_worker_thread(rtc::Thread::Current()));
   cm_->Terminate();
   EXPECT_FALSE(cm_->initialized());
 }
 
 // Test that we can create and destroy a voice and video channel.
 TEST_F(ChannelManagerTest, CreateDestroyChannels) {
   EXPECT_TRUE(cm_->Init());
   cricket::VoiceChannel* voice_channel =
       cm_->CreateVoiceChannel(&fake_mc_, transport_controller_,
                               cricket::CN_AUDIO, false, AudioOptions());
   EXPECT_TRUE(voice_channel != nullptr);
   cricket::VideoChannel* video_channel =
       cm_->CreateVideoChannel(&fake_mc_, transport_controller_,
                               cricket::CN_VIDEO, false, VideoOptions());
   EXPECT_TRUE(video_channel != nullptr);
   cricket::DataChannel* data_channel = cm_->CreateDataChannel(
       transport_controller_, cricket::CN_DATA, false, cricket::DCT_RTP);
   EXPECT_TRUE(data_channel != nullptr);
   cm_->DestroyVideoChannel(video_channel);
   cm_->DestroyVoiceChannel(voice_channel);
   cm_->DestroyDataChannel(data_channel);
   cm_->Terminate();
 }
 
 // Test that we can create and destroy a voice and video channel with a worker.
 TEST_F(ChannelManagerTest, CreateDestroyChannelsOnThread) {
+  network_.Start();
   worker_.Start();
   EXPECT_TRUE(cm_->set_worker_thread(&worker_));
+  EXPECT_TRUE(cm_->set_network_thread(&network_));
   EXPECT_TRUE(cm_->Init());
   delete transport_controller_;
   transport_controller_ =
-      new cricket::FakeTransportController(&worker_, ICEROLE_CONTROLLING);
+      new cricket::FakeTransportController(&network_, ICEROLE_CONTROLLING);
   cricket::VoiceChannel* voice_channel =
       cm_->CreateVoiceChannel(&fake_mc_, transport_controller_,
                               cricket::CN_AUDIO, false, AudioOptions());
   EXPECT_TRUE(voice_channel != nullptr);
   cricket::VideoChannel* video_channel =
       cm_->CreateVideoChannel(&fake_mc_, transport_controller_,
                               cricket::CN_VIDEO, false, VideoOptions());
   EXPECT_TRUE(video_channel != nullptr);
   cricket::DataChannel* data_channel = cm_->CreateDataChannel(
       transport_controller_, cricket::CN_DATA, false, cricket::DCT_RTP);
@@ skipping 87 matching lines @@
   EXPECT_FALSE(cm_->SetVideoRtxEnabled(false));
 
   // Can set again after terminate.
   cm_->Terminate();
   EXPECT_TRUE(cm_->SetVideoRtxEnabled(true));
   cm_->GetSupportedVideoCodecs(&codecs);
   EXPECT_TRUE(ContainsMatchingCodec(codecs, rtx_codec));
 }
 
 }  // namespace cricket