Minor cleanup of QUIC MockConnection and PacketSavingConnection

net/quic/quic_session_test.cc

Index: net/quic/quic_session_test.cc
diff --git a/net/quic/quic_session_test.cc b/net/quic/quic_session_test.cc
index f0d4e5cc46fd91751df5f574523ce1671dee1f58..6523a3552fbbdc4ca519d478d9ac12484a917ebd 100644
--- a/net/quic/quic_session_test.cc
+++ b/net/quic/quic_session_test.cc
@@ -123,8 +123,7 @@ class TestSession : public QuicSession {
 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";
@@ -170,7 +169,6 @@ class QuicSessionTest : public ::testing::Test {
     closed_streams_.insert(id);
   }
 
-  QuicGuid guid_;
   MockConnection* connection_;
   TestSession session_;
   set<QuicStreamId> closed_streams_;
@@ -178,7 +176,7 @@ class QuicSessionTest : public ::testing::Test {
 };
 
 TEST_F(QuicSessionTest, PeerAddress) {
-  EXPECT_EQ(IPEndPoint(), session_.peer_address());
+  EXPECT_EQ(IPEndPoint(Loopback4(), kTestPort), session_.peer_address());
 }
 
 TEST_F(QuicSessionTest, IsCryptoHandshakeConfirmed) {
@@ -395,7 +393,7 @@ TEST_F(QuicSessionTest, IncreasedTimeoutAfterCryptoHandshake) {
 
 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();
@@ -435,7 +433,7 @@ TEST_F(QuicSessionTest, ZombieStream) {
 
 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();