Add net log entries that summarize transmit and receive byte counts.

net/socket/tcp_client_socket_unittest.cc

-// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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/socket/tcp_client_socket.h"
 
 #include "base/basictypes.h"
 #include "net/base/address_list.h"
 #include "net/base/host_resolver.h"
 #include "net/base/io_buffer.h"
 #include "net/base/listen_socket.h"
 #include "net/base/net_log.h"
 #include "net/base/net_log_unittest.h"
 #include "net/base/net_errors.h"
 #include "net/base/test_completion_callback.h"
 #include "net/base/winsock_init.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
 namespace net {
 
 namespace {
 
 const char kServerReply[] = "HTTP/1.1 404 Not Found";
 
 class TCPClientSocketTest
     : public PlatformTest, public ListenSocket::ListenSocketDelegate {
  public:
-  TCPClientSocketTest() {
+  TCPClientSocketTest() : net_log_(CapturingNetLog::kUnbounded) {
   }
 
   // Implement ListenSocketDelegate methods
   virtual void DidAccept(ListenSocket* server, ListenSocket* connection) {
     connected_sock_ = connection;
   }
   virtual void DidRead(ListenSocket*, const std::string& s) {
     // TODO(dkegel): this might not be long enough to tickle some bugs.
     connected_sock_->Send(kServerReply,
                           arraysize(kServerReply) - 1,
@@ skipping 12 matching lines @@
   void PauseServerReads() {
     connected_sock_->PauseReads();
   }
 
   void ResumeServerReads() {
     connected_sock_->ResumeReads();
   }
 
  protected:
   int listen_port_;
+  CapturingNetLog net_log_;
   scoped_ptr<TCPClientSocket> sock_;
 
  private:
   scoped_refptr<ListenSocket> listen_sock_;
   scoped_refptr<ListenSocket> connected_sock_;
 };
 
 void TCPClientSocketTest::SetUp() {
   PlatformTest::SetUp();
 
@@ skipping 13 matching lines @@
   }
   ASSERT_TRUE(sock != NULL);
   listen_sock_ = sock;
   listen_port_ = port;
 
   AddressList addr;
   scoped_refptr<HostResolver> resolver(CreateSystemHostResolver(NULL));
   HostResolver::RequestInfo info("localhost", listen_port_);
   int rv = resolver->Resolve(info, &addr, NULL, NULL, NULL);
   CHECK_EQ(rv, OK);
-  sock_.reset(new TCPClientSocket(addr));
+  sock_.reset(new TCPClientSocket(addr, &net_log_));
 }
 
 TEST_F(TCPClientSocketTest, Connect) {
   TestCompletionCallback callback;
   EXPECT_FALSE(sock_->IsConnected());
 
-  CapturingBoundNetLog log(CapturingNetLog::kUnbounded);
-  int rv = sock_->Connect(&callback, log.bound());
+  int rv = sock_->Connect(&callback);
   EXPECT_TRUE(net::LogContainsBeginEvent(
-      log.entries(), 0, net::NetLog::TYPE_TCP_CONNECT));
+      net_log_.entries(), 0, net::NetLog::TYPE_TCP_CONNECT));
   if (rv != OK) {
     ASSERT_EQ(rv, ERR_IO_PENDING);
     EXPECT_FALSE(net::LogContainsEndEvent(
-        log.entries(), -1, net::NetLog::TYPE_TCP_CONNECT));
+        net_log_.entries(), -1, net::NetLog::TYPE_TCP_CONNECT));
 
     rv = callback.WaitForResult();
     EXPECT_EQ(rv, OK);
   }
 
   EXPECT_TRUE(sock_->IsConnected());
   EXPECT_TRUE(net::LogContainsEndEvent(
-      log.entries(), -1, net::NetLog::TYPE_TCP_CONNECT));
+      net_log_.entries(), -1, net::NetLog::TYPE_TCP_CONNECT));
 
   sock_->Disconnect();
   EXPECT_FALSE(sock_->IsConnected());
 }
 
 // TODO(wtc): Add unit tests for IsConnectedAndIdle:
 //   - Server closes a connection.
 //   - Server sends data unexpectedly.
 
 TEST_F(TCPClientSocketTest, Read) {
   TestCompletionCallback callback;
-  int rv = sock_->Connect(&callback, NULL);
+  int rv = sock_->Connect(&callback);
   if (rv != OK) {
     ASSERT_EQ(rv, ERR_IO_PENDING);
 
     rv = callback.WaitForResult();
     EXPECT_EQ(rv, OK);
   }
 
   const char request_text[] = "GET / HTTP/1.0\r\n\r\n";
   scoped_refptr<IOBuffer> request_buffer =
       new IOBuffer(arraysize(request_text) - 1);
@@ skipping 24 matching lines @@
   // then close the server socket, and note the close.
 
   rv = sock_->Read(buf, 4096, &callback);
   ASSERT_EQ(ERR_IO_PENDING, rv);
   CloseServerSocket();
   EXPECT_EQ(0, callback.WaitForResult());
 }
 
 TEST_F(TCPClientSocketTest, Read_SmallChunks) {
   TestCompletionCallback callback;
-  int rv = sock_->Connect(&callback, NULL);
+  int rv = sock_->Connect(&callback);
   if (rv != OK) {
     ASSERT_EQ(rv, ERR_IO_PENDING);
 
     rv = callback.WaitForResult();
     EXPECT_EQ(rv, OK);
   }
 
   const char request_text[] = "GET / HTTP/1.0\r\n\r\n";
   scoped_refptr<IOBuffer> request_buffer =
       new IOBuffer(arraysize(request_text) - 1);
@@ skipping 24 matching lines @@
   // then close the server socket, and note the close.
 
   rv = sock_->Read(buf, 1, &callback);
   ASSERT_EQ(ERR_IO_PENDING, rv);
   CloseServerSocket();
   EXPECT_EQ(0, callback.WaitForResult());
 }
 
 TEST_F(TCPClientSocketTest, Read_Interrupted) {
   TestCompletionCallback callback;
-  int rv = sock_->Connect(&callback, NULL);
+  int rv = sock_->Connect(&callback);
   if (rv != OK) {
     ASSERT_EQ(ERR_IO_PENDING, rv);
 
     rv = callback.WaitForResult();
     EXPECT_EQ(rv, OK);
   }
 
   const char request_text[] = "GET / HTTP/1.0\r\n\r\n";
   scoped_refptr<IOBuffer> request_buffer =
       new IOBuffer(arraysize(request_text) - 1);
@@ skipping 13 matching lines @@
   EXPECT_TRUE(rv >= 0 || rv == ERR_IO_PENDING);
 
   if (rv == ERR_IO_PENDING)
     rv = callback.WaitForResult();
 
   EXPECT_NE(0, rv);
 }
 
 TEST_F(TCPClientSocketTest, DISABLED_FullDuplex_ReadFirst) {
   TestCompletionCallback callback;
-  int rv = sock_->Connect(&callback, NULL);
+  int rv = sock_->Connect(&callback);
   if (rv != OK) {
     ASSERT_EQ(rv, ERR_IO_PENDING);
 
     rv = callback.WaitForResult();
     EXPECT_EQ(rv, OK);
   }
 
   // Read first.  There's no data, so it should return ERR_IO_PENDING.
   const int kBufLen = 4096;
   scoped_refptr<IOBuffer> buf = new IOBuffer(kBufLen);
@@ skipping 21 matching lines @@
   // At this point, both read and write have returned ERR_IO_PENDING, and the
   // write callback has executed.  We wait for the read callback to run now to
   // make sure that the socket can handle full duplex communications.
 
   rv = callback.WaitForResult();
   EXPECT_GE(rv, 0);
 }
 
 TEST_F(TCPClientSocketTest, DISABLED_FullDuplex_WriteFirst) {
   TestCompletionCallback callback;
-  int rv = sock_->Connect(&callback, NULL);
+  int rv = sock_->Connect(&callback);
   if (rv != OK) {
     ASSERT_EQ(ERR_IO_PENDING, rv);
 
     rv = callback.WaitForResult();
     EXPECT_EQ(OK, rv);
   }
 
   PauseServerReads();
   const int kWriteBufLen = 64 * 1024;
   scoped_refptr<IOBuffer> request_buffer = new IOBuffer(kWriteBufLen);
@@ skipping 33 matching lines @@
   // Close the server socket, so there will at least be a 0-byte read.
   CloseServerSocket();
 
   rv = callback.WaitForResult();
   EXPECT_GE(rv, 0);
 }
 
 }  // namespace
 
 }  // namespace net