Land Recent QUIC Changes.

net/quic/quic_session_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_session.h"
 
 #include <set>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 428 matching lines @@
   EXPECT_CALL(*stream4, OnCanWrite());
   session_.OnCanWrite();
   EXPECT_FALSE(session_.HasPendingWrites());
 }
 
 // Regression test for http://crbug.com/248737
 TEST_P(QuicSessionTest, OutOfOrderHeaders) {
   QuicSpdyCompressor compressor;
   vector<QuicStreamFrame> frames;
   QuicPacketHeader header;
-  header.public_header.guid = session_.guid();
+  header.public_header.connection_id = session_.connection_id();
 
   TestStream* stream2 = session_.CreateOutgoingDataStream();
   TestStream* stream4 = session_.CreateOutgoingDataStream();
   stream2->CloseWriteSide();
   stream4->CloseWriteSide();
 
   // Create frame with headers for stream2.
   string compressed_headers1 = compressor.CompressHeaders(headers_);
   QuicStreamFrame frame1(
       stream2->id(), false, 0, MakeIOVector(compressed_headers1));
@@ skipping 53 matching lines @@
   // Reset the stream, but since the headers have not been decompressed
   // it will become a zombie and will continue to process data
   // until the headers are decompressed.
   EXPECT_CALL(*connection, SendRstStream(stream_id1, QUIC_STREAM_CANCELLED, 0));
   session.SendRstStream(stream_id1, QUIC_STREAM_CANCELLED, 0);
 
   EXPECT_EQ(1u, session.GetNumOpenStreams());
 
   vector<QuicStreamFrame> frames;
   QuicPacketHeader header;
-  header.public_header.guid = session_.guid();
+  header.public_header.connection_id = session_.connection_id();
 
   // Create frame with headers for stream2.
   QuicSpdyCompressor compressor;
   string compressed_headers1 = compressor.CompressHeaders(headers_);
   QuicStreamFrame frame1(
       stream1->id(), false, 0, MakeIOVector(compressed_headers1));
 
   // Process the second frame first.  This will cause the headers to
   // be queued up and processed after the first frame is processed.
   frames.push_back(frame1);
@@ skipping 54 matching lines @@
   }
 
   QuicRstStreamFrame rst1(stream_id1, QUIC_STREAM_NO_ERROR, 0);
   session_.OnRstStream(rst1);
   EXPECT_EQ(0u, session_.GetNumOpenStreams());
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net