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

net/proxy/proxy_resolver_js_bindings_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/scoped_ptr.h"
 #include "net/base/address_list.h"
 #include "net/base/mock_host_resolver.h"
 #include "net/base/net_errors.h"
+#include "net/base/net_log.h"
 #include "net/base/net_util.h"
 #include "net/base/sys_addrinfo.h"
 #include "net/proxy/proxy_resolver_js_bindings.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 namespace {
 
 // This is a HostResolver that synchronously resolves all hosts to the
 // following address list of length 3:
 //     192.168.1.1
 //     172.22.34.1
 //     200.100.1.2
 class MockHostResolverWithMultipleResults : public HostResolver {
  public:
   // HostResolver methods:
   virtual int Resolve(const RequestInfo& info,
                       AddressList* addresses,
                       CompletionCallback* callback,
                       RequestHandle* out_req,
-                      LoadLog* load_log) {
+                      const BoundNetLog& net_log) {
     // Build up the result list (in reverse).
     AddressList temp_list = ResolveIPLiteral("200.100.1.2");
     temp_list = PrependAddressToList("172.22.34.1", temp_list);
     temp_list = PrependAddressToList("192.168.1.1", temp_list);
     *addresses = temp_list;
     return OK;
   }
   virtual void CancelRequest(RequestHandle req) {}
   virtual void AddObserver(Observer* observer) {}
   virtual void RemoveObserver(Observer* observer) {}
@@ skipping 102 matching lines @@
       "*", ADDRESS_FAMILY_IPV4, "192.168.1.2");
   host_resolver->rules()->AddRuleForAddressFamily(
       "foo", ADDRESS_FAMILY_UNSPECIFIED, "192.168.2.1");
   host_resolver->rules()->AddRuleForAddressFamily(
       "*", ADDRESS_FAMILY_UNSPECIFIED, "192.168.2.2");
 
   // Verify that our mock setups works as expected, and we get different results
   // depending if the address family was IPV4_ONLY or not.
   HostResolver::RequestInfo info("foo", 80);
   AddressList address_list;
-  EXPECT_EQ(OK, host_resolver->Resolve(info, &address_list, NULL, NULL, NULL));
+  EXPECT_EQ(OK, host_resolver->Resolve(info, &address_list, NULL, NULL,
+                                       BoundNetLog()));
   EXPECT_EQ("192.168.2.1", NetAddressToString(address_list.head()));
 
   info.set_address_family(ADDRESS_FAMILY_IPV4);
-  EXPECT_EQ(OK, host_resolver->Resolve(info, &address_list, NULL, NULL, NULL));
+  EXPECT_EQ(OK, host_resolver->Resolve(info, &address_list, NULL, NULL,
+                                       BoundNetLog()));
   EXPECT_EQ("192.168.1.1", NetAddressToString(address_list.head()));
 
   // Now the actual test.
   EXPECT_EQ("192.168.1.2", bindings->MyIpAddress());       // IPv4 restricted.
   EXPECT_EQ("192.168.1.1", bindings->DnsResolve("foo"));   // IPv4 restricted.
   EXPECT_EQ("192.168.1.2", bindings->DnsResolve("foo2"));  // IPv4 restricted.
 
   EXPECT_EQ("192.168.2.2", bindings->MyIpAddressEx());       // Unrestricted.
   EXPECT_EQ("192.168.2.1", bindings->DnsResolveEx("foo"));   // Unrestricted.
   EXPECT_EQ("192.168.2.2", bindings->DnsResolveEx("foo2"));  // Unrestricted.
@@ skipping 12 matching lines @@
 
   EXPECT_EQ("192.168.1.1;172.22.34.1;200.100.1.2",
             bindings->MyIpAddressEx());
 
   EXPECT_EQ("192.168.1.1;172.22.34.1;200.100.1.2",
             bindings->DnsResolveEx("FOO"));
 }
 
 }  // namespace
 }  // namespace net