commit c42f1a764d66e40a5dcf1a14bc4f01ae4ae0014b
author Danil Chapovalov <danilchap@webrtc.org> Mon Apr 01 08:40:56 2019
committer Commit Bot <commit-bot@chromium.org> Mon Apr 01 08:41:03 2019
tree 9bec8faefe6858a501769e56fbace870117a698f
parent 90705cbc414286806a39f715634d90c161ac9bb3

Revert "Move TaskQueueFactory from Call::Create parameter to CallConfig"

This reverts commit 90705cbc414286806a39f715634d90c161ac9bb3.

Reason for revert: failed to compile due to conflict with another recent change

Original change's description:
> Move TaskQueueFactory from Call::Create parameter to CallConfig
> 
> to decouple it from other optional parameters
> and with plan to make it mandatory
> 
> Bug: webrtc:10284
> Change-Id: I1224abd90d8e06e0ee2d2baaa6d0fd54f8caad2b
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/130470
> Reviewed-by: Niels Moller <nisse@webrtc.org>
> Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#27382}

TBR=danilchap@webrtc.org,nisse@webrtc.org

Change-Id: Ibe70f191d35f72e0373e49e5300d765b88d02db0
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:10284
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/130472
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27383}

call/call.cc

diff --git a/call/call.cc b/call/call.cc
index e458c48..3f7ef5f 100644
--- a/call/call.cc
+++ b/call/call.cc
@@ -424,20 +424,16 @@
 }
 
 Call* Call::Create(const Call::Config& config) {
-  return Create(config, Clock::GetRealTimeClock(),
-                ProcessThread::Create("PacerThread"),
-                ProcessThread::Create("ModuleProcessThread"));
+  return Create(
+      config, Clock::GetRealTimeClock(), ProcessThread::Create("PacerThread"),
+      ProcessThread::Create("ModuleProcessThread"), &GlobalTaskQueueFactory());
 }
 
 Call* Call::Create(const Call::Config& config,
                    Clock* clock,
                    std::unique_ptr<ProcessThread> call_thread,
-                   std::unique_ptr<ProcessThread> pacer_thread) {
-  // TODO(bugs.webrtc.org/10284): DCHECK task_queue_factory dependency is
-  // always provided in the config.
-  TaskQueueFactory* task_queue_factory = config.task_queue_factory
-                                             ? config.task_queue_factory
-                                             : &GlobalTaskQueueFactory();
+                   std::unique_ptr<ProcessThread> pacer_thread,
+                   TaskQueueFactory* task_queue_factory) {
   return new internal::Call(
       clock, config,
       absl::make_unique<RtpTransportControllerSend>(

call/call.h

diff --git a/call/call.h b/call/call.h
index 1c29fee..90977da 100644
--- a/call/call.h
+++ b/call/call.h
@@ -16,6 +16,7 @@
 #include <vector>
 
 #include "api/media_types.h"
+#include "api/task_queue/task_queue_factory.h"
 #include "call/audio_receive_stream.h"
 #include "call/audio_send_stream.h"
 #include "call/call_config.h"
@@ -53,7 +54,8 @@
   static Call* Create(const Call::Config& config,
                       Clock* clock,
                       std::unique_ptr<ProcessThread> call_thread,
-                      std::unique_ptr<ProcessThread> pacer_thread);
+                      std::unique_ptr<ProcessThread> pacer_thread,
+                      TaskQueueFactory* task_queue_factory);
 
   virtual AudioSendStream* CreateAudioSendStream(
       const AudioSendStream::Config& config) = 0;

call/call_config.h

diff --git a/call/call_config.h b/call/call_config.h
index eaac16b..260a3ac 100644
--- a/call/call_config.h
+++ b/call/call_config.h
@@ -13,7 +13,6 @@
 #include "api/bitrate_constraints.h"
 #include "api/fec_controller.h"
 #include "api/rtc_error.h"
-#include "api/task_queue/task_queue_factory.h"
 #include "api/transport/network_control.h"
 #include "call/audio_state.h"
 
@@ -46,9 +45,6 @@
   // FecController to use for this call.
   FecControllerFactoryInterface* fec_controller_factory = nullptr;
 
-  // Task Queue Factory to be used in this call.
-  TaskQueueFactory* task_queue_factory = nullptr;
-
   // Network controller factory to use for this call.
   NetworkControllerFactoryInterface* network_controller_factory = nullptr;
 };