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

net/flip/flip_network_transaction_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 "net/flip/flip_network_transaction.h"
 
 #include "base/basictypes.h"
 #include "base/ref_counted.h"
 #include "net/base/completion_callback.h"
 #include "net/base/load_log_unittest.h"
@@ skipping 1035 matching lines @@
   EXPECT_EQ(OK, out.rv);
   EXPECT_EQ("HTTP/1.1 200 OK", out.status_line);
   EXPECT_EQ("hello!", out.response_data);
 
   // Check that the LoadLog was filled reasonably.
   // This test is intentionally non-specific about the exact ordering of
   // the log; instead we just check to make sure that certain events exist.
   EXPECT_LT(0u, log->entries().size());
   int pos = 0;
   // We know the first event at position 0.
-  net::ExpectLogContains(log, 0,
-      net::LoadLog::TYPE_FLIP_TRANSACTION_INIT_CONNECTION,
-      net::LoadLog::PHASE_BEGIN);
+  EXPECT_TRUE(net::LogContainsBeginEvent(
+      *log, 0, net::LoadLog::TYPE_FLIP_TRANSACTION_INIT_CONNECTION));
   // For the rest of the events, allow additional events in the middle,
   // but expect these to be logged in order.
   pos = net::ExpectLogContainsSomewhere(log, 0,
       net::LoadLog::TYPE_FLIP_TRANSACTION_INIT_CONNECTION,
       net::LoadLog::PHASE_END);
   pos = net::ExpectLogContainsSomewhere(log, pos + 1,
       net::LoadLog::TYPE_FLIP_TRANSACTION_SEND_REQUEST,
       net::LoadLog::PHASE_BEGIN);
   pos = net::ExpectLogContainsSomewhere(log, pos + 1,
       net::LoadLog::TYPE_FLIP_TRANSACTION_SEND_REQUEST,
       net::LoadLog::PHASE_END);
   pos = net::ExpectLogContainsSomewhere(log, pos + 1,
       net::LoadLog::TYPE_FLIP_TRANSACTION_READ_HEADERS,
       net::LoadLog::PHASE_BEGIN);
   pos = net::ExpectLogContainsSomewhere(log, pos + 1,
       net::LoadLog::TYPE_FLIP_TRANSACTION_READ_HEADERS,
       net::LoadLog::PHASE_END);
   pos = net::ExpectLogContainsSomewhere(log, pos + 1,
       net::LoadLog::TYPE_FLIP_TRANSACTION_READ_BODY,
       net::LoadLog::PHASE_BEGIN);
   pos = net::ExpectLogContainsSomewhere(log, pos + 1,
       net::LoadLog::TYPE_FLIP_TRANSACTION_READ_BODY,
       net::LoadLog::PHASE_END);
 }
 
 }  // namespace net