Land Recent QUIC Changes.

Allow running the test server in secure mode.

Merge internal change: 62164374
https://codereview.chromium.org/181413007/


Implement special behaviors (closing and timing out) in the test server.
Testing only.

Merge internal change: 62158630
https://codereview.chromium.org/177293008/


Moving a preexisting DCHECK to a new and more helpful dfatal.

Merge internal change: 62089588
https://codereview.chromium.org/181463007/


PACKET_NBYTE_GUID -> PACKET_NBYTE_CONNECTION_ID
GUID->ConnectionId
QuicGuid->QuicConnectionId
guid->connection_id
except for the dos proto, which I'm leaving alone for now.

renaming quic guid to connection id. no functional change.

Merge internal change: 62087636
https://codereview.chromium.org/181483006/


QUIC-local change to extend per-connection stats. Extending
QuicConnectionStats to add two Cubic-related stats.

Merge internal change: 61977906
https://codereview.chromium.org/177843017/


Implement an early retransmit timer in QUIC's TcpLossAlgorithm to
replace immediate loss and retransmission.

Merge internal change: 61976680
https://codereview.chromium.org/182083002/


Add a time based loss detection algorithm to QUIC that loses packets
after 1.25RTTs and at least one nack.

Merge internal change: 61975778
https://codereview.chromium.org/182063002/


QUIC test cleanup to always use MockLossAlgorithm in QuicConnectionTest.

Merge internal change: 61972606
https://codereview.chromium.org/180783003/


Minor optimizations to QuicUnackedPacketMap and QuicSentPacketManager to
improve load testing.

Merge internal change: 61961987
https://codereview.chromium.org/181433007/


Cleanup: Rename http_message_test_utils.{h,cc,_test.cc} to
http_message.{h,cc,_test.cc}

This is how it should be named (defines/tests class HTTPMessage), and
it's confusingly similar to the unrelated http_message_utils.h

n/a (test only)

Merge internal change: 61955207
https://codereview.chromium.org/181703005/


Test-only change to QuicConnectionTest to use MockLossAlgorithm instead
of specific details of the TCP loss detection algorithm.

Merge internal change: 61953382
https://codereview.chromium.org/181693005/


Add mock methods for SendBlocked and SendWindowUpdate in QuicConnection

(test only)

Merge internal change: 61945606
https://codereview.chromium.org/181973002/


Add SendWindowUpdate and SendBlocked methods to QuicConnection.
Not used yet.

Merge internal change: 61915742
https://codereview.chromium.org/181413005/


Start using the loss timeout in QuicSentPacketManager and add a mock
implementation of the LossDetectionInterface for testing.

Merge internal change: 61903890
https://codereview.chromium.org/181723003/

R=rch@chromium.org

Review URL: https://codereview.chromium.org/182523002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@253899 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 9 insertions, 8 deletions

diff --git a/net/quic/quic_http_stream_test.cc b/net/quic/quic_http_stream_test.cc
index 2695c8f..ff09164 100644
--- a/net/quic/quic_http_stream_test.cc
+++ b/net/quic/quic_http_stream_test.cc
@@ -52,11 +52,12 @@ const char kUploadData[] = "hello world!";
 class TestQuicConnection : public QuicConnection {
  public:
   TestQuicConnection(const QuicVersionVector& versions,
-                     QuicGuid guid,
+                     QuicConnectionId connection_id,
                      IPEndPoint address,
                      QuicConnectionHelper* helper,
                      QuicPacketWriter* writer)
-      : QuicConnection(guid, address, helper, writer, false, versions) {
+      : QuicConnection(connection_id, address, helper, writer, false,
+                       versions) {
   }
 
   void SetSendAlgorithm(SendAlgorithmInterface* send_algorithm) {
@@ -124,9 +125,9 @@ class QuicHttpStreamTest : public ::testing::TestWithParam<QuicVersion> {
       : net_log_(BoundNetLog()),
         use_closing_stream_(false),
         read_buffer_(new IOBufferWithSize(4096)),
-        guid_(2),
+        connection_id_(2),
         stream_id_(GetParam() > QUIC_VERSION_12 ? 5 : 3),
-        maker_(GetParam(), guid_),
+        maker_(GetParam(), connection_id_),
         random_generator_(0) {
     IPAddressNumber ip;
     CHECK(ParseIPLiteralToNumber("192.0.2.33", &ip));
@@ -193,9 +194,9 @@ class QuicHttpStreamTest : public ::testing::TestWithParam<QuicVersion> {
     helper_.reset(new QuicConnectionHelper(runner_.get(), &clock_,
                                            &random_generator_));
     writer_.reset(new QuicDefaultPacketWriter(socket));
-    connection_ = new TestQuicConnection(SupportedVersions(GetParam()), guid_,
-                                         peer_addr_, helper_.get(),
-                                         writer_.get());
+    connection_ = new TestQuicConnection(SupportedVersions(GetParam()),
+                                         connection_id_, peer_addr_,
+                                         helper_.get(), writer_.get());
     connection_->set_visitor(&visitor_);
     connection_->SetSendAlgorithm(send_algorithm_);
     connection_->SetReceiveAlgorithm(receive_algorithm_);
@@ -314,7 +315,7 @@ class QuicHttpStreamTest : public ::testing::TestWithParam<QuicVersion> {
     return compressor.CompressHeaders(headers);
   }
 
-  const QuicGuid guid_;
+  const QuicConnectionId connection_id_;
   const QuicStreamId stream_id_;
   QuicTestPacketMaker maker_;
   IPEndPoint self_addr_;