Land Recent QUIC changes.

net/quic/quic_protocol_test.cc

Index: net/quic/quic_protocol_test.cc
diff --git a/net/quic/quic_protocol_test.cc b/net/quic/quic_protocol_test.cc
index 0dcfcc666cae0760291f700d1587a5fcc5a6f093..0d54ea4d694b313069cf3dff5a620f5abebeeb55 100644
--- a/net/quic/quic_protocol_test.cc
+++ b/net/quic/quic_protocol_test.cc
@@ -132,13 +132,19 @@ TEST(QuicProtocolTest, QuicVersionToString) {
             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) {