Land Recent QUIC Changes.

net/tools/quic/end_to_end_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 <stddef.h>
 #include <string>
 #include <sys/epoll.h>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 124 matching lines @@
       for (int use_pacing = 0; use_pacing < 2; ++use_pacing) {
         for (int spdy_version = 3; spdy_version <= 4; ++spdy_version) {
           const QuicVersionVector* client_versions =
               spdy_version == 3 ? &spdy3_versions : &spdy4_versions;
           // Add an entry for server and client supporting all versions.
           params.push_back(TestParams(*client_versions, all_supported_versions,
                                       (*client_versions)[0], use_pacing != 0,
                                       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);
             params.push_back(
                 TestParams(*client_versions, server_supported_versions,
                            server_supported_versions[0], use_pacing != 0,
                            use_fec != 0, congestion_control_tag));
           }
         }
       }
@@ skipping 1288 matching lines @@
     // Waits for up to 50 ms.
     client_->client()->WaitForEvents();
   }
   server_thread_->Resume();
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace tools
 }  // namespace net