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

net/proxy/proxy_resolver_v8_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 "base/file_util.h"
 #include "base/string_util.h"
 #include "base/path_service.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/load_log_unittest.h"
 #include "net/base/net_errors.h"
@@ skipping 417 matching lines @@
 
   EXPECT_EQ(OK, result);
   EXPECT_FALSE(proxy_info.is_direct());
   EXPECT_EQ("c:100", proxy_info.proxy_server().ToURI());
 
   // Note that dnsResolve() was never called directly, but it appears
   // in the LoadLog. This is because it gets called indirectly by
   // isInNet() and isResolvable().
 
   EXPECT_EQ(6u, log->entries().size());
-  ExpectLogContains(log, 0, LoadLog::TYPE_PROXY_RESOLVER_V8_MY_IP_ADDRESS,
-                    LoadLog::PHASE_BEGIN);
-  ExpectLogContains(log, 1, LoadLog::TYPE_PROXY_RESOLVER_V8_MY_IP_ADDRESS,
-                    LoadLog::PHASE_END);
-  ExpectLogContains(log, 2, LoadLog::TYPE_PROXY_RESOLVER_V8_DNS_RESOLVE,
-                    LoadLog::PHASE_BEGIN);
-  ExpectLogContains(log, 3, LoadLog::TYPE_PROXY_RESOLVER_V8_DNS_RESOLVE,
-                    LoadLog::PHASE_END);
-  ExpectLogContains(log, 4, LoadLog::TYPE_PROXY_RESOLVER_V8_DNS_RESOLVE,
-                    LoadLog::PHASE_BEGIN);
-  ExpectLogContains(log, 5, LoadLog::TYPE_PROXY_RESOLVER_V8_DNS_RESOLVE,
-                    LoadLog::PHASE_END);
+  EXPECT_TRUE(LogContainsBeginEvent(
+      *log, 0, LoadLog::TYPE_PROXY_RESOLVER_V8_MY_IP_ADDRESS));
+  EXPECT_TRUE(LogContainsEndEvent(
+      *log, 1, LoadLog::TYPE_PROXY_RESOLVER_V8_MY_IP_ADDRESS));
+  EXPECT_TRUE(LogContainsBeginEvent(
+      *log, 2, LoadLog::TYPE_PROXY_RESOLVER_V8_DNS_RESOLVE));
+  EXPECT_TRUE(LogContainsEndEvent(
+      *log, 3, LoadLog::TYPE_PROXY_RESOLVER_V8_DNS_RESOLVE));
+  EXPECT_TRUE(LogContainsBeginEvent(
+      *log, 4, LoadLog::TYPE_PROXY_RESOLVER_V8_DNS_RESOLVE));
+  EXPECT_TRUE(LogContainsEndEvent(
+      *log, 5, LoadLog::TYPE_PROXY_RESOLVER_V8_DNS_RESOLVE));
 }
 
 // Try loading a PAC script that ends with a comment and has no terminal
 // newline. This should not cause problems with the PAC utility functions
 // that we add to the script's environment.
 // http://crbug.com/22864
 TEST(ProxyResolverV8Test, EndsWithCommentNoNewline) {
   ProxyResolverV8WithMockBindings resolver;
   int result = resolver.SetPacScriptFromDisk("ends_with_comment.js");
   EXPECT_EQ(OK, result);
@@ skipping 38 matching lines @@
   ProxyInfo proxy_info;
   result = resolver.GetProxyForURL(kQueryUrl, &proxy_info, NULL, NULL, NULL);
 
   EXPECT_EQ(OK, result);
   EXPECT_FALSE(proxy_info.is_direct());
   EXPECT_EQ("success:80", proxy_info.proxy_server().ToURI());
 }
 
 }  // namespace
 }  // namespace net