Cleanup: Address some of the todos in net_log.h...

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 {
 
 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);
 }
 
-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) {
   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,
@@ skipping 12 matching lines @@
     "t=131: -HOST_RESOLVER_IMPL",
     NetLogUtil::PrettyPrintAsEventTree(log, 0));
 }
 
 TEST(NetLogUtilTest, Basic2) {
   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(MakeStringEntry(14, "Multiline\nString"));
+  // Attach a string parameter to a CANCELLED event.
+  CapturingNetLog::Entry e =
+      MakeEventEntry(12, NetLog::TYPE_CANCELLED, NetLog::PHASE_NONE);
+  e.extra_parameters =
+      new NetLogStringParameter("string_name", "string_value");
+  log.push_back(e);
 
   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= 14:    \"Multiline\n"
-    "String\"\n"
-    "t=131: -HOST_RESOLVER_IMPL",
-    NetLogUtil::PrettyPrintAsEventTree(log, 0));
+      "t=  1: +HOST_RESOLVER_IMPL   [dt=130]\n"
+      "t= 12:    CANCELLED\n"
+      "{\n"
+      "   \"string_name\": \"string_value\"\n"
+      "}\n"
+      "t=131: -HOST_RESOLVER_IMPL",
+      NetLogUtil::PrettyPrintAsEventTree(log, 0));
 }
 
 TEST(NetLogUtilTest, UnmatchedOpen) {
   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(
@@ skipping 40 matching lines @@
     "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