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

net/url_request/url_request_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/url_request/url_request_unittest.h"
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
@@ skipping 200 matching lines @@
     EXPECT_TRUE(r.is_pending());
 
     MessageLoop::current()->Run();
 
     EXPECT_EQ(1, d.response_started_count());
     EXPECT_FALSE(d.received_data_before_response());
     EXPECT_NE(0, d.bytes_received());
 
     // The first part of the log will be for URL_REQUEST_START.
     // After that, there should be an HTTP_TRANSACTION_READ_BODY
-    EXPECT_TRUE(
-        net::LogContains(*r.load_log(), 0,
-                         net::LoadLog::TYPE_URL_REQUEST_START,
-                         net::LoadLog::PHASE_BEGIN));
-    EXPECT_TRUE(
-        net::LogContains(*r.load_log(), -3,
-                         net::LoadLog::TYPE_URL_REQUEST_START,
-                         net::LoadLog::PHASE_END));
-    EXPECT_TRUE(
-        net::LogContains(*r.load_log(), -2,
-                         net::LoadLog::TYPE_HTTP_TRANSACTION_READ_BODY,
-                         net::LoadLog::PHASE_BEGIN));
-    EXPECT_TRUE(
-        net::LogContains(*r.load_log(), -1,
-                         net::LoadLog::TYPE_HTTP_TRANSACTION_READ_BODY,
-                         net::LoadLog::PHASE_END));
+    EXPECT_TRUE(net::LogContainsBeginEvent(
+        *r.load_log(), 0, net::LoadLog::TYPE_URL_REQUEST_START));
+    EXPECT_TRUE(net::LogContainsEndEvent(
+        *r.load_log(), -3, net::LoadLog::TYPE_URL_REQUEST_START));
+    EXPECT_TRUE(net::LogContainsBeginEvent(
+        *r.load_log(), -2, net::LoadLog::TYPE_HTTP_TRANSACTION_READ_BODY));
+    EXPECT_TRUE(net::LogContainsEndEvent(
+        *r.load_log(), -1, net::LoadLog::TYPE_HTTP_TRANSACTION_READ_BODY));
   }
 }
 
 TEST_F(URLRequestTestHTTP, GetTest) {
   ASSERT_TRUE(NULL != server_.get());
   TestDelegate d;
   {
     TestURLRequest r(server_->TestServerPage(""), &d);
 
     r.Start();
@@ skipping 1917 matching lines @@
   ASSERT_TRUE(NULL != server_.get());
   TestDelegate d;
   TestURLRequest
       req(server_->TestServerPage("echoheaderoverride?Accept-Charset"), &d);
   req.set_context(new URLRequestTestContext());
   req.SetExtraRequestHeaders("Accept-Charset: koi-8r");
   req.Start();
   MessageLoop::current()->Run();
   EXPECT_EQ(std::string("koi-8r"), d.data_received());
 }