Add support for attaching custom parameters to NetLog events.

net/base/net_log_util_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/base/net_log_unittest.h"
 #include "net/base/net_log_util.h"
 #include "net/base/net_errors.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 namespace {
 
-NetLog::Entry MakeEventEntry(int t,
-                             NetLog::EventType event_type,
-                             NetLog::EventPhase event_phase) {
-  NetLog::Entry entry;
-  entry.type = NetLog::Entry::TYPE_EVENT;
-  entry.time = MakeTime(t);
-  entry.event = NetLog::Event(event_type, event_phase);
-  return entry;
+CapturingNetLog::Entry MakeEventEntry(int t,
+                                      NetLog::EventType event_type,
+                                      NetLog::EventPhase event_phase) {
+  return CapturingNetLog::Entry(event_type,
+                                MakeTime(t),
+                                NetLog::Source(),
+                                event_phase,
+                                NULL);
 }
 
-NetLog::Entry MakeStringEntry(int t, const std::string& string) {
-  NetLog::Entry entry;
-  entry.type = NetLog::Entry::TYPE_STRING;
-  entry.time = MakeTime(t);
-  entry.string = string;
-  return entry;
-}
-
-NetLog::Entry MakeErrorCodeEntry(int t, int error_code) {
-  NetLog::Entry entry;
-  entry.type = NetLog::Entry::TYPE_ERROR_CODE;
-  entry.time = MakeTime(t);
-  entry.error_code = error_code;
-  return entry;
+CapturingNetLog::Entry MakeStringEntry(int t, const std::string& string) {
+  return CapturingNetLog::Entry(NetLog::TYPE_TODO_STRING,
+                                MakeTime(t),
+                                NetLog::Source(),
+                                NetLog::PHASE_NONE,
+                                new NetLogStringParameter(string));
 }
 
 TEST(NetLogUtilTest, Basic) {
-  std::vector<NetLog::Entry> log;
+  CapturingNetLog::EntryList log;
 
   log.push_back(MakeEventEntry(1, NetLog::TYPE_HOST_RESOLVER_IMPL,
                                NetLog::PHASE_BEGIN));
   log.push_back(
       MakeEventEntry(5, NetLog::TYPE_HOST_RESOLVER_IMPL_OBSERVER_ONSTART,
                      NetLog::PHASE_BEGIN));
   log.push_back(
        MakeEventEntry(8, NetLog::TYPE_HOST_RESOLVER_IMPL_OBSERVER_ONSTART,
                       NetLog::PHASE_END));
 
   log.push_back(MakeEventEntry(12, NetLog::TYPE_CANCELLED,
                                NetLog::PHASE_NONE));
 
   log.push_back(MakeEventEntry(131, NetLog::TYPE_HOST_RESOLVER_IMPL,
                                NetLog::PHASE_END));
 
   EXPECT_EQ(
     "t=  1: +HOST_RESOLVER_IMPL                    [dt=130]\n"
     "t=  5:    HOST_RESOLVER_IMPL_OBSERVER_ONSTART [dt=  3]\n"
     "t= 12:    CANCELLED\n"
     "t=131: -HOST_RESOLVER_IMPL",
     NetLogUtil::PrettyPrintAsEventTree(log, 0));
 }
 
 TEST(NetLogUtilTest, Basic2) {
-  std::vector<NetLog::Entry> log;
+  CapturingNetLog::EntryList log;
 
   log.push_back(MakeEventEntry(1, NetLog::TYPE_HOST_RESOLVER_IMPL,
                                NetLog::PHASE_BEGIN));
 
   log.push_back(MakeStringEntry(12, "Sup foo"));
-  log.push_back(MakeErrorCodeEntry(12, ERR_UNEXPECTED));
   log.push_back(MakeStringEntry(14, "Multiline\nString"));
 
   log.push_back(MakeEventEntry(131, NetLog::TYPE_HOST_RESOLVER_IMPL,
                                NetLog::PHASE_END));
 
   EXPECT_EQ(
     "t=  1: +HOST_RESOLVER_IMPL   [dt=130]\n"
     "t= 12:    \"Sup foo\"\n"
-    "t= 12:    error code: -9 (net::ERR_UNEXPECTED)\n"
     "t= 14:    \"Multiline\n"
     "String\"\n"
     "t=131: -HOST_RESOLVER_IMPL",
     NetLogUtil::PrettyPrintAsEventTree(log, 0));
 }
 
 TEST(NetLogUtilTest, UnmatchedOpen) {
-  std::vector<NetLog::Entry> log;
+  CapturingNetLog::EntryList log;
 
   log.push_back(MakeEventEntry(3, NetLog::TYPE_HOST_RESOLVER_IMPL,
                                NetLog::PHASE_BEGIN));
   // Note that there is no matching call to PHASE_END for all of the following.
   log.push_back(
       MakeEventEntry(
           6, NetLog::TYPE_HOST_RESOLVER_IMPL_OBSERVER_ONSTART,
           NetLog::PHASE_BEGIN));
   log.push_back(
       MakeEventEntry(7, NetLog::TYPE_HOST_RESOLVER_IMPL_OBSERVER_ONSTART,
@@ skipping 10 matching lines @@
     "t= 3: +HOST_RESOLVER_IMPL                          [dt=13]\n"
     "t= 6:   +HOST_RESOLVER_IMPL_OBSERVER_ONSTART       [dt=10]\n"
     "t= 7:     +HOST_RESOLVER_IMPL_OBSERVER_ONSTART     [dt= 9]\n"
     "t= 8:       +HOST_RESOLVER_IMPL_OBSERVER_ONSTART   [dt= 8]\n"
     "t=10:          CANCELLED\n"
     "t=16: -HOST_RESOLVER_IMPL",
     NetLogUtil::PrettyPrintAsEventTree(log, 0));
 }
 
 TEST(NetLogUtilTest, DisplayOfTruncated) {
-  std::vector<NetLog::Entry> log;
+  CapturingNetLog::EntryList log;
 
   log.push_back(MakeEventEntry(0,
                                NetLog::TYPE_TCP_CONNECT,
                                NetLog::PHASE_BEGIN));
   for (size_t i = 1; i <= 3; ++i) {
     log.push_back(MakeEventEntry(i,
                                  NetLog::TYPE_CANCELLED,
                                  NetLog::PHASE_NONE));
   }
   log.push_back(MakeEventEntry(9,
                                NetLog::TYPE_TCP_CONNECT,
                                NetLog::PHASE_END));
 
   EXPECT_EQ(
     "t=0: +TCP_CONNECT   [dt=9]\n"
     "t=1:    CANCELLED\n"
     "t=2:    CANCELLED\n"
     "t=3:    CANCELLED\n"
     " ... Truncated 4 entries ...\n"
     "t=9: -TCP_CONNECT",
     NetLogUtil::PrettyPrintAsEventTree(log, 4));
 }
 
 }  // namespace
 }  // namespace net