Land Recent QUIC Changes.

net/quic/quic_flow_controller_test.cc

 // Copyright 2014 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/quic/quic_flow_controller.h"
 
 #include "base/strings/stringprintf.h"
 #include "net/quic/quic_flags.h"
 #include "net/quic/quic_utils.h"
 #include "net/quic/test_tools/quic_connection_peer.h"
@@ skipping 102 matching lines @@
 
   // Result is that once again we have a fully open receive window.
   EXPECT_FALSE(flow_controller_->FlowControlViolation());
   EXPECT_EQ(kInitialFlowControlWindowForTest,
             QuicFlowControllerPeer::ReceiveWindowSize(flow_controller_.get()));
 }
 
 TEST_F(QuicFlowControllerTest,
        DisabledWhenQuicVersionDoesNotSupportFlowControl) {
   // Only support version 16: no flow control.
-  QuicVersionVector supported_versions;
-  supported_versions.push_back(QUIC_VERSION_16);
-  QuicConnectionPeer::SetSupportedVersions(&connection_, supported_versions);
+  QuicConnectionPeer::SetSupportedVersions(&connection_,
+                                           SupportedVersions(QUIC_VERSION_16));
 
   Initialize();
 
   MockConnection connection(false);
 
   // Should not be enabled, and should not report as blocked.
   EXPECT_FALSE(flow_controller_->IsEnabled());
   EXPECT_FALSE(flow_controller_->IsBlocked());
   EXPECT_FALSE(flow_controller_->FlowControlViolation());
 
@@ skipping 80 matching lines @@
   flow_controller_->AddBytesSent(send_window_);
   EXPECT_TRUE(flow_controller_->IsBlocked());
   EXPECT_EQ(0u, flow_controller_->SendWindowSize());
 
   // BLOCKED frame should get sent as send offset has changed.
   flow_controller_->MaybeSendBlocked();
 }
 
 }  // namespace test
 }  // namespace net