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

net/socket_stream/socket_stream_unittest.cc

 // Copyright (c) 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 <string>
 #include <vector>
 
 #include "net/base/load_log.h"
 #include "net/base/load_log_unittest.h"
 #include "net/base/mock_host_resolver.h"
@@ skipping 192 matching lines @@
 
   const std::vector<SocketStreamEvent>& events = delegate->GetSeenEvents();
   EXPECT_EQ(3U, events.size());
 
   EXPECT_EQ(SocketStreamEvent::EVENT_AUTH_REQUIRED, events[0].event_type);
   EXPECT_EQ(SocketStreamEvent::EVENT_CONNECTED, events[1].event_type);
   EXPECT_EQ(SocketStreamEvent::EVENT_CLOSE, events[2].event_type);
 
   // The first and last entries of the LoadLog should be for
   // SOCKET_STREAM_CONNECT.
-  ExpectLogContains(socket_stream->load_log(), 0,
-                    LoadLog::TYPE_SOCKET_STREAM_CONNECT,
-                    LoadLog::PHASE_BEGIN);
-  ExpectLogContains(socket_stream->load_log(),
-                    socket_stream->load_log()->entries().size() - 1,
-                    LoadLog::TYPE_SOCKET_STREAM_CONNECT,
-                    LoadLog::PHASE_END);
+  EXPECT_TRUE(LogContainsBeginEvent(
+      *socket_stream->load_log(), 0, LoadLog::TYPE_SOCKET_STREAM_CONNECT));
+  EXPECT_TRUE(LogContainsEndEvent(
+      *socket_stream->load_log(), -1, LoadLog::TYPE_SOCKET_STREAM_CONNECT));
 }
 
 }  // namespace net