Land Recent QUIC Changes.

net/tools/quic/quic_server_session_test.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/tools/quic/quic_server_session.h"
 
 #include "net/quic/crypto/cached_network_parameters.h"
 #include "net/quic/crypto/quic_crypto_server_config.h"
 #include "net/quic/crypto/quic_random.h"
 #include "net/quic/quic_connection.h"
@@ skipping 281 matching lines @@
   ~MockQuicCryptoServerStream() override {}
 
   MOCK_METHOD1(SendServerConfigUpdate,
                void(const CachedNetworkParameters* cached_network_parameters));
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockQuicCryptoServerStream);
 };
 
 TEST_P(QuicServerSessionTest, BandwidthEstimates) {
-  if (version() <= QUIC_VERSION_21) {
-    return;
-  }
-
   // Test that bandwidth estimate updates are sent to the client, only after the
   // bandwidth estimate has changes sufficiently, and enough time has passed,
   // and we don't have any other data to write.
 
   int32 bandwidth_estimate_kbytes_per_second = 123;
   int32 max_bandwidth_estimate_kbytes_per_second = 134;
   int32 max_bandwidth_estimate_timestamp = 1122334455;
   const string serving_region = "not a real region";
   session_->set_serving_region(serving_region);
 
@@ skipping 111 matching lines @@
   cached_network_params.set_serving_region(kTestServingRegion);
   crypto_stream->set_previous_cached_network_params(cached_network_params);
   EXPECT_CALL(*connection_, ResumeConnectionState(_)).Times(1);
   session_->OnConfigNegotiated();
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace tools
 }  // namespace net