Removed RTCStatsCollector::ProducePartialResultsOnWorkerThread.

webrtc/api/rtcstatscollector.cc

 /*
  *  Copyright 2016 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 397 matching lines @@
   } else if (!num_pending_partial_reports_) {
     // Only start gathering stats if we're not already gathering stats. In the
     // case of already gathering stats, |callback_| will be invoked when there
     // are no more pending partial reports.
 
     // "Now" using a system clock, relative to the UNIX epoch (Jan 1, 1970,
     // UTC), in microseconds. The system clock could be modified and is not
     // necessarily monotonically increasing.
     int64_t timestamp_us = rtc::TimeUTCMicros();
 
-    num_pending_partial_reports_ = 3;
+    num_pending_partial_reports_ = 2;
     partial_report_timestamp_us_ = cache_now_us;
-    invoker_.AsyncInvoke<void>(RTC_FROM_HERE, signaling_thread_,
-        rtc::Bind(&RTCStatsCollector::ProducePartialResultsOnSignalingThread,
-            rtc::scoped_refptr<RTCStatsCollector>(this), timestamp_us));
-
-    // TODO(hbos): No stats are gathered by
-    // |ProducePartialResultsOnWorkerThread|, remove it.
-    invoker_.AsyncInvoke<void>(RTC_FROM_HERE, worker_thread_,
-        rtc::Bind(&RTCStatsCollector::ProducePartialResultsOnWorkerThread,
-            rtc::scoped_refptr<RTCStatsCollector>(this), timestamp_us));
 
     // Prepare |channel_names_| and |media_info_| for use in
     // |ProducePartialResultsOnNetworkThread|.
     channel_name_pairs_.reset(new ChannelNamePairs());
     if (pc_->session()->voice_channel()) {
       channel_name_pairs_->voice = rtc::Optional<ChannelNamePair>(
           ChannelNamePair(pc_->session()->voice_channel()->content_name(),
                           pc_->session()->voice_channel()->transport_name()));
     }
     if (pc_->session()->video_channel()) {
       channel_name_pairs_->video = rtc::Optional<ChannelNamePair>(
           ChannelNamePair(pc_->session()->video_channel()->content_name(),
                           pc_->session()->video_channel()->transport_name()));
     }
     if (pc_->session()->data_channel()) {
       channel_name_pairs_->data = rtc::Optional<ChannelNamePair>(
           ChannelNamePair(pc_->session()->data_channel()->content_name(),
                           pc_->session()->data_channel()->transport_name()));
     }
     media_info_.reset(PrepareMediaInfo_s().release());
+
     invoker_.AsyncInvoke<void>(RTC_FROM_HERE, network_thread_,
         rtc::Bind(&RTCStatsCollector::ProducePartialResultsOnNetworkThread,
             rtc::scoped_refptr<RTCStatsCollector>(this), timestamp_us));
+    ProducePartialResultsOnSignalingThread(timestamp_us);
   }
 }
 
 void RTCStatsCollector::ClearCachedStatsReport() {
   RTC_DCHECK(signaling_thread_->IsCurrent());
   cached_report_ = nullptr;
 }
 
 void RTCStatsCollector::WaitForPendingRequest() {
   RTC_DCHECK(signaling_thread_->IsCurrent());
@@ skipping 12 matching lines @@
   rtc::scoped_refptr<RTCStatsReport> report = RTCStatsReport::Create(
       timestamp_us);
 
   ProduceDataChannelStats_s(timestamp_us, report.get());
   ProduceMediaStreamAndTrackStats_s(timestamp_us, report.get());
   ProducePeerConnectionStats_s(timestamp_us, report.get());
 
   AddPartialResults(report);
 }
 
-void RTCStatsCollector::ProducePartialResultsOnWorkerThread(
-    int64_t timestamp_us) {
-  RTC_DCHECK(worker_thread_->IsCurrent());
-  rtc::scoped_refptr<RTCStatsReport> report = RTCStatsReport::Create(
-      timestamp_us);
-
-  // TODO(hbos): There are no stats to be gathered on this thread, remove this
-  // method.
-
-  AddPartialResults(report);
-}
-
 void RTCStatsCollector::ProducePartialResultsOnNetworkThread(
     int64_t timestamp_us) {
   RTC_DCHECK(network_thread_->IsCurrent());
   rtc::scoped_refptr<RTCStatsReport> report = RTCStatsReport::Create(
       timestamp_us);
 
   std::unique_ptr<SessionStats> session_stats =
       pc_->session()->GetStats(*channel_name_pairs_);
   if (session_stats) {
     std::map<std::string, CertificateStatsPair> transport_cert_stats =
@@ skipping 449 matching lines @@
     const std::string& type) {
   return CandidateTypeToRTCIceCandidateType(type);
 }
 
 const char* DataStateToRTCDataChannelStateForTesting(
     DataChannelInterface::DataState state) {
   return DataStateToRTCDataChannelState(state);
 }
 
 }  // namespace webrtc