Land Recent QUIC Changes.

net/quic/quic_http_stream_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_http_stream.h"
 
 #include <vector>
 
 #include "net/base/net_errors.h"
 #include "net/base/test_completion_callback.h"
@@ skipping 34 matching lines @@
 
 namespace net {
 namespace test {
 namespace {
 
 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) {
     QuicConnectionPeer::SetSendAlgorithm(this, send_algorithm);
   }
 
   void SetReceiveAlgorithm(ReceiveAlgorithmInterface* receive_algorithm) {
     QuicConnectionPeer::SetReceiveAlgorithm(this, receive_algorithm);
   }
 };
@@ skipping 47 matching lines @@
           packet(packet) {
     }
     IoMode mode;
     QuicEncryptedPacket* packet;
   };
 
   QuicHttpStreamTest()
       : 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));
     peer_addr_ = IPEndPoint(ip, 443);
     self_addr_ = IPEndPoint(ip, 8435);
   }
 
   ~QuicHttpStreamTest() {
     session_->CloseSessionOnError(ERR_ABORTED);
     for (size_t i = 0; i < writes_.size(); i++) {
@@ skipping 46 matching lines @@
     EXPECT_CALL(*send_algorithm_, TimeUntilSend(_, _, _, _)).
         WillRepeatedly(Return(QuicTime::Delta::Zero()));
     EXPECT_CALL(*send_algorithm_, SmoothedRtt()).WillRepeatedly(
         Return(QuicTime::Delta::Zero()));
     EXPECT_CALL(*send_algorithm_, BandwidthEstimate()).WillRepeatedly(
         Return(QuicBandwidth::Zero()));
     EXPECT_CALL(*send_algorithm_, SetFromConfig(_, _)).Times(AnyNumber());
     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_);
     crypto_config_.SetDefaults();
     session_.reset(
         new QuicClientSession(connection_,
                               scoped_ptr<DatagramClientSocket>(socket),
                               writer_.Pass(), NULL,
                               &crypto_client_stream_factory_,
                               "www.google.com", DefaultQuicConfig(),
@@ skipping 98 matching lines @@
                                    bool write_priority,
                                    RequestPriority priority) {
     QuicSpdyCompressor compressor;
     if (write_priority) {
       return compressor.CompressHeadersWithPriority(
           ConvertRequestPriorityToQuicPriority(priority), headers);
     }
     return compressor.CompressHeaders(headers);
   }
 
-  const QuicGuid guid_;
+  const QuicConnectionId connection_id_;
   const QuicStreamId stream_id_;
   QuicTestPacketMaker maker_;
   IPEndPoint self_addr_;
   IPEndPoint peer_addr_;
   MockRandom random_generator_;
   MockCryptoClientStreamFactory crypto_client_stream_factory_;
   scoped_ptr<StaticSocketDataProvider> socket_data_;
   std::vector<PacketToWrite> writes_;
 };
 
@@ skipping 434 matching lines @@
       WillRepeatedly(Return(QuicTime::Delta::Zero()));
 
   // Data should flush out now.
   connection_->OnCanWrite();
   EXPECT_FALSE(reliable_stream->HasBufferedData());
   EXPECT_TRUE(AtEof());
 }
 
 }  // namespace test
 }  // namespace net