Generalize the net module's LoadLog facility from a passive container, to an event stream (NetLog).

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_log_unittest.h"
 #include "net/base/net_errors.h"
 #include "net/proxy/proxy_info.h"
 #include "net/proxy/proxy_resolver_js_bindings.h"
 #include "net/proxy/proxy_resolver_v8.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 namespace {
 
 // Javascript bindings for ProxyResolverV8, which returns mock values.
@@ skipping 91 matching lines @@
 const GURL kQueryUrl("http://www.google.com");
 const GURL kPacUrl;
 
 
 TEST(ProxyResolverV8Test, Direct) {
   ProxyResolverV8WithMockBindings resolver;
   int result = resolver.SetPacScriptFromDisk("direct.js");
   EXPECT_EQ(OK, result);
 
   ProxyInfo proxy_info;
-  scoped_refptr<LoadLog> log(new LoadLog(LoadLog::kUnbounded));
-  result = resolver.GetProxyForURL(kQueryUrl, &proxy_info, NULL, NULL, log);
+  CapturingBoundNetLog log(CapturingNetLog::kUnbounded);
+  result = resolver.GetProxyForURL(kQueryUrl, &proxy_info, NULL, NULL,
+                                   log.bound());
 
   EXPECT_EQ(OK, result);
   EXPECT_TRUE(proxy_info.is_direct());
 
   EXPECT_EQ(0U, resolver.mock_js_bindings()->alerts.size());
   EXPECT_EQ(0U, resolver.mock_js_bindings()->errors.size());
 
   // No bindings were called, so no log entries.
-  EXPECT_EQ(0u, log->entries().size());
+  EXPECT_EQ(0u, log.entries().size());
 }
 
 TEST(ProxyResolverV8Test, ReturnEmptyString) {
   ProxyResolverV8WithMockBindings resolver;
   int result = resolver.SetPacScriptFromDisk("return_empty_string.js");
   EXPECT_EQ(OK, result);
 
   ProxyInfo proxy_info;
   result = resolver.GetProxyForURL(kQueryUrl, &proxy_info, NULL, NULL, NULL);
 
@@ skipping 267 matching lines @@
   // MyIpAddressEx was called once.
   EXPECT_EQ(1, bindings->my_ip_address_ex_count);
 
   // DnsResolveEx was called 2 times.
   ASSERT_EQ(2U, bindings->dns_resolves_ex.size());
   EXPECT_EQ("is_resolvable", bindings->dns_resolves_ex[0]);
   EXPECT_EQ("foobar", bindings->dns_resolves_ex[1]);
 }
 
 // Test that calls to the myIpAddress() and dnsResolve() bindings get
-// logged to the LoadLog parameter.
-TEST(ProxyResolverV8Test, LoadLog) {
+// logged to the NetLog parameter.
+TEST(ProxyResolverV8Test, NetLog) {
   ProxyResolverV8WithMockBindings resolver;
   int result = resolver.SetPacScriptFromDisk("simple.js");
   EXPECT_EQ(OK, result);
 
   ProxyInfo proxy_info;
-  scoped_refptr<LoadLog> log(new LoadLog(LoadLog::kUnbounded));
-  result = resolver.GetProxyForURL(kQueryUrl, &proxy_info, NULL, NULL, log);
+  CapturingBoundNetLog log(CapturingNetLog::kUnbounded);
+  result = resolver.GetProxyForURL(kQueryUrl, &proxy_info, NULL, NULL,
+                                   log.bound());
 
   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
+  // in the NetLog. This is because it gets called indirectly by
   // isInNet() and isResolvable().
 
-  EXPECT_EQ(6u, log->entries().size());
+  EXPECT_EQ(6u, log.entries().size());
   EXPECT_TRUE(LogContainsBeginEvent(
-      *log, 0, LoadLog::TYPE_PROXY_RESOLVER_V8_MY_IP_ADDRESS));
+      log.entries(), 0, NetLog::TYPE_PROXY_RESOLVER_V8_MY_IP_ADDRESS));
   EXPECT_TRUE(LogContainsEndEvent(
-      *log, 1, LoadLog::TYPE_PROXY_RESOLVER_V8_MY_IP_ADDRESS));
+      log.entries(), 1, NetLog::TYPE_PROXY_RESOLVER_V8_MY_IP_ADDRESS));
   EXPECT_TRUE(LogContainsBeginEvent(
-      *log, 2, LoadLog::TYPE_PROXY_RESOLVER_V8_DNS_RESOLVE));
+      log.entries(), 2, NetLog::TYPE_PROXY_RESOLVER_V8_DNS_RESOLVE));
   EXPECT_TRUE(LogContainsEndEvent(
-      *log, 3, LoadLog::TYPE_PROXY_RESOLVER_V8_DNS_RESOLVE));
+      log.entries(), 3, NetLog::TYPE_PROXY_RESOLVER_V8_DNS_RESOLVE));
   EXPECT_TRUE(LogContainsBeginEvent(
-      *log, 4, LoadLog::TYPE_PROXY_RESOLVER_V8_DNS_RESOLVE));
+      log.entries(), 4, NetLog::TYPE_PROXY_RESOLVER_V8_DNS_RESOLVE));
   EXPECT_TRUE(LogContainsEndEvent(
-      *log, 5, LoadLog::TYPE_PROXY_RESOLVER_V8_DNS_RESOLVE));
+      log.entries(), 5, NetLog::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);
 
   ProxyInfo proxy_info;
-  scoped_refptr<LoadLog> log(new LoadLog(LoadLog::kUnbounded));
-  result = resolver.GetProxyForURL(kQueryUrl, &proxy_info, NULL, NULL, log);
+  CapturingBoundNetLog log(CapturingNetLog::kUnbounded);
+  result = resolver.GetProxyForURL(kQueryUrl, &proxy_info, NULL, NULL,
+                                   log.bound());
 
   EXPECT_EQ(OK, result);
   EXPECT_FALSE(proxy_info.is_direct());
   EXPECT_EQ("success:80", proxy_info.proxy_server().ToURI());
 }
 
 // Try loading a PAC script that ends with a statement 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, EndsWithStatementNoNewline) {
   ProxyResolverV8WithMockBindings resolver;
   int result = resolver.SetPacScriptFromDisk(
       "ends_with_statement_no_semicolon.js");
   EXPECT_EQ(OK, result);
 
   ProxyInfo proxy_info;
-  scoped_refptr<LoadLog> log(new LoadLog(LoadLog::kUnbounded));
-  result = resolver.GetProxyForURL(kQueryUrl, &proxy_info, NULL, NULL, log);
+  CapturingBoundNetLog log(CapturingNetLog::kUnbounded);
+  result = resolver.GetProxyForURL(kQueryUrl, &proxy_info, NULL, NULL,
+                                   log.bound());
 
   EXPECT_EQ(OK, result);
   EXPECT_FALSE(proxy_info.is_direct());
   EXPECT_EQ("success:3", proxy_info.proxy_server().ToURI());
 }
 
 // Test the return values from myIpAddress(), myIpAddressEx(), dnsResolve(),
 // dnsResolveEx(), isResolvable(), isResolvableEx(), when the the binding
 // returns empty string (failure). This simulates the return values from
 // those functions when the underlying DNS resolution fails.
 TEST(ProxyResolverV8Test, DNSResolutionFailure) {
   ProxyResolverV8WithMockBindings resolver;
   int result = resolver.SetPacScriptFromDisk("dns_fail.js");
   EXPECT_EQ(OK, result);
 
   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