Revert "Revert of Propagate probing cluster id to SendTimeHistory. (patchset #5 id:80001 of https:/…

webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.cc

 /*
  *  Copyright (c) 2015 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 74 matching lines @@
   } else {
     last_acked_seq_num_ = packet_feedback_vector.back().sequence_number;
     has_received_ack_ = true;
   }
 }
 
 void FullBweSender::OnPacketsSent(const Packets& packets) {
   for (Packet* packet : packets) {
     if (packet->GetPacketType() == Packet::kMedia) {
       MediaPacket* media_packet = static_cast<MediaPacket*>(packet);
-      send_time_history_.AddAndRemoveOld(media_packet->header().sequenceNumber,
-                                         media_packet->payload_size(),
-                                         packet->paced());
+      // TODO(philipel): Add probe_cluster_id to Packet class in order
+      //                 to create tests for probing using cluster ids.
+      send_time_history_.AddAndRemoveOld(
+          media_packet->header().sequenceNumber, media_packet->payload_size(),
+          packet->paced(), PacketInfo::kNotAProbe);
       send_time_history_.OnSentPacket(media_packet->header().sequenceNumber,
                                       media_packet->sender_timestamp_ms());
     }
   }
 }
 
 void FullBweSender::OnReceiveBitrateChanged(const std::vector<uint32_t>& ssrcs,
                                             uint32_t bitrate) {
   feedback_observer_->OnReceivedEstimatedBitrate(bitrate);
 }
@@ skipping 33 matching lines @@
       packet_feedback_vector_.back().arrival_time_ms;
   FeedbackPacket* fb = new SendSideBweFeedback(
       flow_id_, now_ms * 1000, corrected_send_time_ms, packet_feedback_vector_);
   packet_feedback_vector_.clear();
   return fb;
 }
 
 }  // namespace bwe
 }  // namespace testing
 }  // namespace webrtc