Revert of Propagate probing cluster id to SendTimeHistory.

webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h

 /*
  *  Copyright (c) 2012 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 227 matching lines @@
   virtual void OnReceivedRtcpReceiverReport(
       const ReportBlockList& report_blocks,
       int64_t rtt,
       int64_t now_ms) = 0;
 
   virtual ~RtcpBandwidthObserver() {}
 };
 
 struct PacketInfo {
   PacketInfo(int64_t arrival_time_ms, uint16_t sequence_number)
-      : PacketInfo(-1,
-                   arrival_time_ms,
-                   -1,
-                   sequence_number,
-                   0,
-                   false,
-                   kNotAProbe) {}
+      : PacketInfo(-1, arrival_time_ms, -1, sequence_number, 0, false) {}
 
   PacketInfo(int64_t arrival_time_ms,
              int64_t send_time_ms,
              uint16_t sequence_number,
              size_t payload_size,
-             bool was_paced,
-             int probe_cluster_id)
+             bool was_paced)
       : PacketInfo(-1,
                    arrival_time_ms,
                    send_time_ms,
                    sequence_number,
                    payload_size,
-                   was_paced,
-                   probe_cluster_id) {}
+                   was_paced) {}
 
   PacketInfo(int64_t creation_time_ms,
              int64_t arrival_time_ms,
              int64_t send_time_ms,
              uint16_t sequence_number,
              size_t payload_size,
-             bool was_paced,
-             int probe_cluster_id)
+             bool was_paced)
       : creation_time_ms(creation_time_ms),
         arrival_time_ms(arrival_time_ms),
         send_time_ms(send_time_ms),
         sequence_number(sequence_number),
         payload_size(payload_size),
-        was_paced(was_paced),
-        probe_cluster_id(probe_cluster_id) {}
-
-  static constexpr int kNotAProbe = -1;
+        was_paced(was_paced) {}
 
   // Time corresponding to when this object was created.
   int64_t creation_time_ms;
   // Time corresponding to when the packet was received. Timestamped with the
   // receiver's clock.
   int64_t arrival_time_ms;
   // Time corresponding to when the packet was sent, timestamped with the
   // sender's clock.
   int64_t send_time_ms;
   // Packet identifier, incremented with 1 for every packet generated by the
   // sender.
   uint16_t sequence_number;
   // Size of the packet excluding RTP headers.
   size_t payload_size;
   // True if the packet was paced out by the pacer.
   bool was_paced;
-  // Which probing cluster this packets belongs to.
-  int probe_cluster_id;
 };
 
 class TransportFeedbackObserver {
  public:
   TransportFeedbackObserver() {}
   virtual ~TransportFeedbackObserver() {}
 
   // Note: Transport-wide sequence number as sequence number. Arrival time
   // must be set to 0.
   virtual void AddPacket(uint16_t sequence_number,
                          size_t length,
-                         bool was_paced,
-                         int probe_cluster_id) = 0;
+                         bool was_paced) = 0;
 
   virtual void OnTransportFeedback(const rtcp::TransportFeedback& feedback) = 0;
 };
 
 class RtcpRttStats {
  public:
   virtual void OnRttUpdate(int64_t rtt) = 0;
 
   virtual int64_t LastProcessedRtt() const = 0;
 
@@ skipping 72 matching lines @@
 class TransportSequenceNumberAllocator {
  public:
   TransportSequenceNumberAllocator() {}
   virtual ~TransportSequenceNumberAllocator() {}
 
   virtual uint16_t AllocateSequenceNumber() = 0;
 };
 
 }  // namespace webrtc
 #endif  // WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_RTCP_DEFINES_H_