Network thread

webrtc/pc/channelmanager.h

Index: webrtc/pc/channelmanager.h
diff --git a/webrtc/pc/channelmanager.h b/webrtc/pc/channelmanager.h
index 72a2f056b5a4c0b6bb797f1a5792f575bb8a9ee3..0753a1435e741e37355900946f7877afb46e53b6 100644
--- a/webrtc/pc/channelmanager.h
+++ b/webrtc/pc/channelmanager.h
@@ -42,10 +42,11 @@ class ChannelManager {
   // ownership of these objects.
   ChannelManager(MediaEngineInterface* me,
                  DataEngineInterface* dme,
-                 rtc::Thread* worker);
+                 rtc::Thread* worker_and_network);
   // Same as above, but gives an easier default DataEngine.
   ChannelManager(MediaEngineInterface* me,
-                 rtc::Thread* worker);
+                 rtc::Thread* worker,
+                 rtc::Thread* network);
   ~ChannelManager();
 
   // Accessors for the worker thread, allowing it to be set after construction,
@@ -56,6 +57,13 @@ class ChannelManager {
     worker_thread_ = thread;
     return true;
   }
+  rtc::Thread* network_thread() const { return network_thread_; }
+  bool set_network_thread(rtc::Thread* thread) {
+    if (initialized_)
+      return false;
+    network_thread_ = thread;
+    return true;
+  }
 
   MediaEngineInterface* media_engine() { return media_engine_.get(); }
 
@@ -138,8 +146,8 @@ class ChannelManager {
 
   void Construct(MediaEngineInterface* me,
                  DataEngineInterface* dme,
-                 rtc::Thread* worker_thread);
-  bool InitMediaEngine_w();
+                 rtc::Thread* worker_thread,
+                 rtc::Thread* network_thread);
   void DestructorDeletes_w();
   void Terminate_w();
   VoiceChannel* CreateVoiceChannel_w(
@@ -167,6 +175,7 @@ class ChannelManager {
   bool initialized_;
   rtc::Thread* main_thread_;
   rtc::Thread* worker_thread_;
+  rtc::Thread* network_thread_;
 
   VoiceChannels voice_channels_;
   VideoChannels video_channels_;