Landing Recent QUIC changes until and including Mon Nov 16 14:15:48 2015

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/quic_crypto_server_config.h"
 #include "net/quic/crypto/quic_random.h"
 #include "net/quic/proto/cached_network_parameters.pb.h"
 #include "net/quic/quic_connection.h"
@@ skipping 349 matching lines @@
   RttStats* rtt_stats =
       QuicSentPacketManagerPeer::GetRttStats(sent_packet_manager);
   rtt_stats->UpdateRtt(QuicTime::Delta::FromMicroseconds(
       rtt_stats->initial_rtt_us()), QuicTime::Delta::Zero(), QuicTime::Zero());
   QuicSustainedBandwidthRecorderPeer::SetBandwidthEstimate(
       &bandwidth_recorder, bandwidth_estimate_kbytes_per_second);
   QuicSustainedBandwidthRecorderPeer::SetMaxBandwidthEstimate(
       &bandwidth_recorder, max_bandwidth_estimate_kbytes_per_second,
       max_bandwidth_estimate_timestamp);
   // Queue up some pending data.
-  session_->MarkConnectionLevelWriteBlocked(
-      kCryptoStreamId, QuicWriteBlockedList::kHighestPriority);
+  session_->MarkConnectionLevelWriteBlocked(kCryptoStreamId,
+                                            net::kHighestPriority);
   EXPECT_TRUE(session_->HasDataToWrite());
 
   // There will be no update sent yet - not enough time has passed.
   QuicTime now = QuicTime::Zero();
   session_->OnCongestionWindowChange(now);
 
   // Bandwidth estimate has now changed sufficiently but not enough time has
   // passed to send a Server Config Update.
   bandwidth_estimate_kbytes_per_second =
       bandwidth_estimate_kbytes_per_second * 1.6;
@@ skipping 110 matching lines @@
       QuicServerSessionPeer::IsBandwidthResumptionEnabled(session_.get()));
   session_->OnConfigNegotiated();
   EXPECT_FALSE(
       QuicServerSessionPeer::IsBandwidthResumptionEnabled(session_.get()));
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace tools
 }  // namespace net