Land Recent QUIC Changes.

net/tools/quic/end_to_end_test.cc

Index: net/tools/quic/end_to_end_test.cc
diff --git a/net/tools/quic/end_to_end_test.cc b/net/tools/quic/end_to_end_test.cc
index 1104528c49d376fbeb29957c78218ba554fe60ea..b2093e0a1ccdd0a6f2400d21c8a1f2d76a896b59 100644
--- a/net/tools/quic/end_to_end_test.cc
+++ b/net/tools/quic/end_to_end_test.cc
@@ -142,12 +142,9 @@ vector<TestParams> GetTestParams() {
                                       use_fec != 0, congestion_control_tag));
 
           // Test client supporting all versions and server supporting 1
-          // version.
-          // Simulate an old server and exercise version downgrade in the
-          // client.
-          // Protocol negotiation should occur. Skip the i = 0 case because it
-          // is
-          // essentially the same as the default case.
+          // version. Simulate an old server and exercise version downgrade in
+          // the client. Protocol negotiation should occur. Skip the i = 0 case
+          // because it is essentially the same as the default case.
           for (QuicVersion version : *client_versions) {
             QuicVersionVector server_supported_versions;
             server_supported_versions.push_back(version);