Revert of Move congestion controller processing to the pacer thread.

webrtc/call/call.cc

Index: webrtc/call/call.cc
diff --git a/webrtc/call/call.cc b/webrtc/call/call.cc
index 31ed39b874cdbb248e036f9861c9957c40c55a38..c7998b2cd8a79026aa532a3a3d91265c8bbd3956 100644
--- a/webrtc/call/call.cc
+++ b/webrtc/call/call.cc
@@ -173,7 +173,7 @@
 
   const int num_cpu_cores_;
   const std::unique_ptr<ProcessThread> module_process_thread_;
-  const std::unique_ptr<ProcessThread> congestion_controller_thread_;
+  const std::unique_ptr<ProcessThread> pacer_thread_;
   const std::unique_ptr<CallStats> call_stats_;
   const std::unique_ptr<BitrateAllocator> bitrate_allocator_;
   Call::Config config_;
@@ -277,8 +277,7 @@
     : clock_(Clock::GetRealTimeClock()),
       num_cpu_cores_(CpuInfo::DetectNumberOfCores()),
       module_process_thread_(ProcessThread::Create("ModuleProcessThread")),
-      congestion_controller_thread_(
-          ProcessThread::Create("CongestionControllerThread")),
+      pacer_thread_(ProcessThread::Create("PacerThread")),
       call_stats_(new CallStats(clock_)),
       bitrate_allocator_(new BitrateAllocator(this)),
       config_(config),
@@ -325,8 +324,11 @@
 
   module_process_thread_->Start();
   module_process_thread_->RegisterModule(call_stats_.get());
-  congestion_controller_thread_->RegisterModule(congestion_controller_.get());
-  congestion_controller_thread_->Start();
+  module_process_thread_->RegisterModule(congestion_controller_.get());
+  pacer_thread_->RegisterModule(congestion_controller_->pacer());
+  pacer_thread_->RegisterModule(
+      congestion_controller_->GetRemoteBitrateEstimator(true));
+  pacer_thread_->Start();
 }
 
 Call::~Call() {
@@ -340,8 +342,11 @@
   RTC_CHECK(video_receive_ssrcs_.empty());
   RTC_CHECK(video_receive_streams_.empty());
 
-  congestion_controller_thread_->Stop();
-  congestion_controller_thread_->DeRegisterModule(congestion_controller_.get());
+  pacer_thread_->Stop();
+  pacer_thread_->DeRegisterModule(congestion_controller_->pacer());
+  pacer_thread_->DeRegisterModule(
+      congestion_controller_->GetRemoteBitrateEstimator(true));
+  module_process_thread_->DeRegisterModule(congestion_controller_.get());
   module_process_thread_->DeRegisterModule(call_stats_.get());
   module_process_thread_->Stop();
   call_stats_->DeregisterStatsObserver(congestion_controller_.get());