Landing Recent QUIC changes until May 20, 2017.

net/quic/core/congestion_control/bandwidth_sampler_test.cc

Index: net/quic/core/congestion_control/bandwidth_sampler_test.cc
diff --git a/net/quic/core/congestion_control/bandwidth_sampler_test.cc b/net/quic/core/congestion_control/bandwidth_sampler_test.cc
index aa9bdd0e56ccef7c839240e8c7bd0c054a67138b..517ab552cb8b236608d2b2080c85273caa45ee13 100644
--- a/net/quic/core/congestion_control/bandwidth_sampler_test.cc
+++ b/net/quic/core/congestion_control/bandwidth_sampler_test.cc
@@ -4,6 +4,7 @@
 
 #include "net/quic/core/congestion_control/bandwidth_sampler.h"
 
+#include "net/quic/platform/api/quic_flags.h"
 #include "net/quic/platform/api/quic_test.h"
 #include "net/quic/test_tools/mock_clock.h"
 
@@ -13,11 +14,17 @@ namespace test {
 class BandwidthSamplerPeer {
  public:
   static size_t GetNumberOfTrackedPackets(const BandwidthSampler& sampler) {
+    if (FLAGS_quic_reloadable_flag_quic_faster_bandwidth_sampler) {
+      return sampler.connection_state_map_new_.number_of_present_entries();
+    }
     return sampler.connection_state_map_.size();
   }
 
   static QuicByteCount GetPacketSize(const BandwidthSampler& sampler,
                                      QuicPacketNumber packet_number) {
+    if (FLAGS_quic_reloadable_flag_quic_faster_bandwidth_sampler) {
+      return sampler.connection_state_map_new_.GetEntry(packet_number)->size;
+    }
     auto iterator = sampler.connection_state_map_.find(packet_number);
     return iterator->second.size;
   }
@@ -197,9 +204,9 @@ TEST_F(BandwidthSamplerTest, NotCongestionControlled) {
   // Send 20 packets, each 1 ms apart. Every even packet is not congestion
   // controlled.
   for (QuicPacketNumber i = 1; i <= 20; i++) {
-    SendPacketInner(i, kRegularPacketSize, i % 2 == 0
-                                               ? HAS_RETRANSMITTABLE_DATA
-                                               : NO_RETRANSMITTABLE_DATA);
+    SendPacketInner(
+        i, kRegularPacketSize,
+        i % 2 == 0 ? HAS_RETRANSMITTABLE_DATA : NO_RETRANSMITTABLE_DATA);
     clock_.AdvanceTime(time_between_packets);
   }
 
@@ -212,9 +219,9 @@ TEST_F(BandwidthSamplerTest, NotCongestionControlled) {
     if (i % 2 == 0) {
       AckPacket(i);
     }
-    SendPacketInner(i + 20, kRegularPacketSize, i % 2 == 0
-                                                    ? HAS_RETRANSMITTABLE_DATA
-                                                    : NO_RETRANSMITTABLE_DATA);
+    SendPacketInner(
+        i + 20, kRegularPacketSize,
+        i % 2 == 0 ? HAS_RETRANSMITTABLE_DATA : NO_RETRANSMITTABLE_DATA);
     clock_.AdvanceTime(time_between_packets);
   }