Minor cleanup of QUIC MockConnection and PacketSavingConnection

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/containers/hash_tables.h"
@@ skipping 105 matching lines @@
   QuicDataStream* GetIncomingReliableStream(QuicStreamId stream_id) {
     return QuicSession::GetIncomingReliableStream(stream_id);
   }
 
   TestCryptoStream crypto_stream_;
 };
 
 class QuicSessionTest : public ::testing::Test {
  protected:
   QuicSessionTest()
-      : guid_(1),
-        connection_(new MockConnection(guid_, IPEndPoint(), false)),
+      : connection_(new MockConnection(false)),
         session_(connection_, true) {
     headers_[":host"] = "www.google.com";
     headers_[":path"] = "/index.hml";
     headers_[":scheme"] = "http";
     headers_["cookie"] =
         "__utma=208381060.1228362404.1372200928.1372200928.1372200928.1; "
         "__utmc=160408618; "
         "GX=DQAAAOEAAACWJYdewdE9rIrW6qw3PtVi2-d729qaa-74KqOsM1NVQblK4VhX"
         "hoALMsy6HOdDad2Sz0flUByv7etmo3mLMidGrBoljqO9hSVA40SLqpG_iuKKSHX"
         "RW3Np4bq0F0SDGDNsW0DSmTS9ufMRrlpARJDS7qAI6M3bghqJp4eABKZiRqebHT"
@@ skipping 25 matching lines @@
         EXPECT_TRUE(session_.IsClosedStream(i)) << " stream id: " << i;
       }
     }
   }
 
   void CloseStream(QuicStreamId id) {
     session_.CloseStream(id);
     closed_streams_.insert(id);
   }
 
-  QuicGuid guid_;
   MockConnection* connection_;
   TestSession session_;
   set<QuicStreamId> closed_streams_;
   SpdyHeaderBlock headers_;
 };
 
 TEST_F(QuicSessionTest, PeerAddress) {
-  EXPECT_EQ(IPEndPoint(), session_.peer_address());
+  EXPECT_EQ(IPEndPoint(Loopback4(), kTestPort), session_.peer_address());
 }
 
 TEST_F(QuicSessionTest, IsCryptoHandshakeConfirmed) {
   EXPECT_FALSE(session_.IsCryptoHandshakeConfirmed());
   CryptoHandshakeMessage message;
   session_.crypto_stream_.OnHandshakeMessage(message);
   EXPECT_TRUE(session_.IsCryptoHandshakeConfirmed());
 }
 
 TEST_F(QuicSessionTest, IsClosedStreamDefault) {
@@ skipping 196 matching lines @@
   EXPECT_EQ(kDefaultInitialTimeoutSecs,
             QuicConnectionPeer::GetNetworkTimeout(connection_).ToSeconds());
   CryptoHandshakeMessage msg;
   session_.crypto_stream_.OnHandshakeMessage(msg);
   EXPECT_EQ(kDefaultTimeoutSecs,
             QuicConnectionPeer::GetNetworkTimeout(connection_).ToSeconds());
 }
 
 TEST_F(QuicSessionTest, ZombieStream) {
   StrictMock<MockConnection>* connection =
-      new StrictMock<MockConnection>(guid_, IPEndPoint(), false);
+      new StrictMock<MockConnection>(false);
   TestSession session(connection, /*is_server=*/ false);
 
   TestStream* stream3 = session.CreateOutgoingDataStream();
   EXPECT_EQ(3u, stream3->id());
   TestStream* stream5 = session.CreateOutgoingDataStream();
   EXPECT_EQ(5u, stream5->id());
   EXPECT_EQ(2u, session.GetNumOpenStreams());
 
   // Reset the stream, but since the headers have not been decompressed
   // it will become a zombie and will continue to process data
@@ skipping 19 matching lines @@
   EXPECT_FALSE(stream3->headers_decompressed());
 
   session.OnStreamFrames(frames);
   EXPECT_EQ(1u, session.GetNumOpenStreams());
 
   EXPECT_TRUE(connection->connected());
 }
 
 TEST_F(QuicSessionTest, ZombieStreamConnectionClose) {
   StrictMock<MockConnection>* connection =
-      new StrictMock<MockConnection>(guid_, IPEndPoint(), false);
+      new StrictMock<MockConnection>(false);
   TestSession session(connection, /*is_server=*/ false);
 
   TestStream* stream3 = session.CreateOutgoingDataStream();
   EXPECT_EQ(3u, stream3->id());
   TestStream* stream5 = session.CreateOutgoingDataStream();
   EXPECT_EQ(5u, stream5->id());
   EXPECT_EQ(2u, session.GetNumOpenStreams());
 
   stream3->CloseWriteSide();
   // Reset the stream, but since the headers have not been decompressed
@@ skipping 23 matching lines @@
       QUIC_STREAM_RST_BEFORE_HEADERS_DECOMPRESSED));
 
   QuicRstStreamFrame rst1(3, QUIC_STREAM_NO_ERROR);
   session_.OnRstStream(rst1);
   EXPECT_EQ(0u, session_.GetNumOpenStreams());
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net