QUIC - Added NetLog's Logging test to quic_network_transaction_unittest.cc.

Deleted the DISABLED Logging test from quic_client_session_test.cc. 

Added code for MockUDPClientSocket::GetLocalAddress.

R=rch@chromium.org

Review URL: https://chromiumcodereview.appspot.com/14614006

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

1 files changed, 0 insertions, 70 deletions

diff --git a/net/quic/quic_client_session_test.cc b/net/quic/quic_client_session_test.cc
index b347dc3..3883a05 100644
--- a/net/quic/quic_client_session_test.cc
+++ b/net/quic/quic_client_session_test.cc
@@ -6,9 +6,7 @@
 
 #include <vector>
 
-#include "base/stl_util.h"
 #include "net/base/capturing_net_log.h"
-#include "net/base/net_log_unittest.h"
 #include "net/base/test_completion_callback.h"
 #include "net/quic/crypto/aes_128_gcm_encrypter.h"
 #include "net/quic/crypto/crypto_protocol.h"
@@ -99,74 +97,6 @@ TEST_F(QuicClientSessionTest, GoAwayReceived) {
   EXPECT_EQ(NULL, session_.CreateOutgoingReliableStream());
 }
 
-TEST_F(QuicClientSessionTest, DISABLED_Logging) {
-  if (!Aes128GcmEncrypter::IsSupported()) {
-    LOG(INFO) << "AES GCM not supported. Test skipped.";
-    return;
-  }
-
-  CompleteCryptoHandshake();
-
-  // TODO(rch): Add some helper methods to simplify packet creation in tests.
-  // Receive a packet, and verify that it was logged.
-  QuicFramer framer(kQuicVersion1, QuicTime::Zero(), false);
-  QuicRstStreamFrame frame;
-  frame.stream_id = 2;
-  frame.error_code = QUIC_STREAM_CONNECTION_ERROR;
-  frame.error_details = "doh!";
-
-  QuicFrames frames;
-  frames.push_back(QuicFrame(&frame));
-  QuicPacketHeader header;
-  header.public_header.guid = 1;
-  header.public_header.reset_flag = false;
-  header.public_header.version_flag = false;
-  header.packet_sequence_number = 1;
-  header.entropy_flag = false;
-  header.fec_flag = false;
-  header.fec_entropy_flag = false;
-  header.fec_group = 0;
-  scoped_ptr<QuicPacket> p(
-      framer.ConstructFrameDataPacket(header, frames).packet);
-  scoped_ptr<QuicEncryptedPacket> packet(framer.EncryptPacket(
-      ENCRYPTION_NONE, 1, *p));
-  IPAddressNumber ip;
-  CHECK(ParseIPLiteralToNumber("192.0.2.33", &ip));
-  IPEndPoint peer_addr = IPEndPoint(ip, 443);
-  IPEndPoint self_addr = IPEndPoint(ip, 8435);
-
-  connection_->ProcessUdpPacketInternal(self_addr, peer_addr, *packet);
-
-  // Check that the NetLog was filled reasonably.
-  net::CapturingNetLog::CapturedEntryList entries;
-  net_log_.GetEntries(&entries);
-  EXPECT_LT(0u, entries.size());
-
-  // Check that we logged a QUIC_SESSION_PACKET_RECEIVED.
-  int pos = net::ExpectLogContainsSomewhere(
-      entries, 0,
-      net::NetLog::TYPE_QUIC_SESSION_PACKET_RECEIVED,
-      net::NetLog::PHASE_NONE);
-  EXPECT_LT(0, pos);
-
-  // ... and also a QUIC_SESSION_RST_STREAM_FRAME_RECEIVED.
-  pos = net::ExpectLogContainsSomewhere(
-      entries, 0,
-      net::NetLog::TYPE_QUIC_SESSION_RST_STREAM_FRAME_RECEIVED,
-      net::NetLog::PHASE_NONE);
-  EXPECT_LT(0, pos);
-
-  int stream_id;
-  ASSERT_TRUE(entries[pos].GetIntegerValue("stream_id", &stream_id));
-  EXPECT_EQ(frame.stream_id, static_cast<QuicStreamId>(stream_id));
-  int error_code;
-  ASSERT_TRUE(entries[pos].GetIntegerValue("error_code", &error_code));
-  EXPECT_EQ(frame.error_code, static_cast<QuicRstStreamErrorCode>(error_code));
-  std::string details;
-  ASSERT_TRUE(entries[pos].GetStringValue("details", &details));
-  EXPECT_EQ(frame.error_details, details);
-}
-
 }  // namespace
 }  // namespace test
 }  // namespace net