Revert of Propagate probing cluster id to SendTimeHistory.

webrtc/modules/pacing/paced_sender.cc

Index: webrtc/modules/pacing/paced_sender.cc
diff --git a/webrtc/modules/pacing/paced_sender.cc b/webrtc/modules/pacing/paced_sender.cc
index 58c7d2d368ad32f7f03fa5b4d2592c083895174d..167be23ab624fda0c7338203dfe9fffb94218257 100644
--- a/webrtc/modules/pacing/paced_sender.cc
+++ b/webrtc/modules/pacing/paced_sender.cc
@@ -389,9 +389,6 @@
     int64_t delta_time_ms = std::min(kMaxIntervalTimeMs, elapsed_time_ms);
     UpdateBytesPerInterval(delta_time_ms);
   }
-
-  int probe_cluster_id = prober_->IsProbing() ? prober_->CurrentClusterId()
-                                              : PacketInfo::kNotAProbe;
   while (!packets_->Empty()) {
     if (media_budget_->bytes_remaining() == 0 && !prober_->IsProbing())
       return;
@@ -400,6 +397,8 @@
     // element from the priority queue but keep it in storage, so that we can
     // reinsert it if send fails.
     const paced_sender::Packet& packet = packets_->BeginPop();
+    int probe_cluster_id =
+        prober_->IsProbing() ? prober_->CurrentClusterId() : -1;
 
     if (SendPacket(packet, probe_cluster_id)) {
       // Send succeeded, remove it from the queue.
@@ -425,7 +424,7 @@
   }
 
   if (padding_needed > 0)
-    SendPadding(padding_needed, probe_cluster_id);
+    SendPadding(static_cast<size_t>(padding_needed));
 }
 
 bool PacedSender::SendPacket(const paced_sender::Packet& packet,
@@ -455,10 +454,9 @@
   return success;
 }
 
-void PacedSender::SendPadding(size_t padding_needed, int probe_cluster_id) {
+void PacedSender::SendPadding(size_t padding_needed) {
   critsect_->Leave();
-  size_t bytes_sent =
-      packet_sender_->TimeToSendPadding(padding_needed, probe_cluster_id);
+  size_t bytes_sent = packet_sender_->TimeToSendPadding(padding_needed);
   critsect_->Enter();
 
   if (bytes_sent > 0) {