Cleanup the unittest helpers in load_log_unittest.h....

net/socket/tcp_client_socket_unittest.cc

 // Copyright (c) 2006-2009 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"
@@ skipping 83 matching lines @@
   CHECK(rv == OK);
   sock_.reset(new TCPClientSocket(addr));
 }
 
 TEST_F(TCPClientSocketTest, Connect) {
   TestCompletionCallback callback;
   EXPECT_FALSE(sock_->IsConnected());
 
   scoped_refptr<LoadLog> log(new LoadLog(LoadLog::kUnbounded));
   int rv = sock_->Connect(&callback, log);
-  EXPECT_TRUE(net::LogContains(
-      *log, 0, net::LoadLog::TYPE_TCP_CONNECT, net::LoadLog::PHASE_BEGIN));
+  EXPECT_TRUE(net::LogContainsBeginEvent(
+      *log, 0, net::LoadLog::TYPE_TCP_CONNECT));
   if (rv != OK) {
     ASSERT_EQ(rv, ERR_IO_PENDING);
-    EXPECT_FALSE(net::LogContains(
-        *log, -1, net::LoadLog::TYPE_TCP_CONNECT, net::LoadLog::PHASE_END));
+    EXPECT_FALSE(net::LogContainsEndEvent(
+        *log, -1, net::LoadLog::TYPE_TCP_CONNECT));
 
     rv = callback.WaitForResult();
     EXPECT_EQ(rv, OK);
   }
 
   EXPECT_TRUE(sock_->IsConnected());
-  EXPECT_TRUE(net::LogContains(
-      *log, -1, net::LoadLog::TYPE_TCP_CONNECT, net::LoadLog::PHASE_END));
+  EXPECT_TRUE(net::LogContainsEndEvent(
+      *log, -1, net::LoadLog::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) {
@@ skipping 211 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