Land Recent QUIC changes.

net/quic/quic_protocol_test.cc

 // Copyright (c) 2012 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_protocol.h"
 
 #include "base/stl_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
@@ skipping 114 matching lines @@
   EXPECT_EQ(QUIC_VERSION_UNSUPPORTED,
             QuicTagToQuicVersion(MakeQuicTag('F', 'A', 'K', 'E')));
 }
 
 TEST(QuicProtocolTest, QuicVersionToString) {
   EXPECT_EQ("QUIC_VERSION_10", QuicVersionToString(QUIC_VERSION_10));
   EXPECT_EQ("QUIC_VERSION_UNSUPPORTED",
             QuicVersionToString(QUIC_VERSION_UNSUPPORTED));
 
   QuicVersion single_version[] = {QUIC_VERSION_10};
-  EXPECT_EQ("QUIC_VERSION_10,",
-            QuicVersionArrayToString(single_version,
-                                     arraysize(single_version)));
+  QuicVersionVector versions_vector;
+  for (size_t i = 0; i < arraysize(single_version); ++i) {
+    versions_vector.push_back(single_version[i]);
+  }
+  EXPECT_EQ("QUIC_VERSION_10", QuicVersionVectorToString(versions_vector));
+
   QuicVersion multiple_versions[] = {QUIC_VERSION_11, QUIC_VERSION_10};
-  EXPECT_EQ("QUIC_VERSION_11,QUIC_VERSION_10,",
-            QuicVersionArrayToString(multiple_versions,
-                                     arraysize(multiple_versions)));
+  versions_vector.clear();
+  for (size_t i = 0; i < arraysize(multiple_versions); ++i) {
+    versions_vector.push_back(multiple_versions[i]);
+  }
+  EXPECT_EQ("QUIC_VERSION_11,QUIC_VERSION_10",
+            QuicVersionVectorToString(versions_vector));
 
   // Make sure that all supported versions are present in QuicVersionToString.
   for (size_t i = 0; i < arraysize(kSupportedQuicVersions); ++i) {
     QuicVersion version = kSupportedQuicVersions[i];
     EXPECT_NE("QUIC_VERSION_UNSUPPORTED", QuicVersionToString(version));
   }
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net