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

chrome/browser/net/passive_log_collector_unittest.cc

 // Copyright (c) 2010 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 "chrome/browser/net/passive_log_collector.h"
 
 #include "base/compiler_specific.h"
 #include "base/format_macros.h"
 #include "base/string_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 typedef PassiveLogCollector::RequestTracker RequestTracker;
 typedef PassiveLogCollector::RequestInfoList RequestInfoList;
 typedef net::NetLog NetLog;
 
 const NetLog::SourceType kSourceType = NetLog::SOURCE_NONE;
 
 PassiveLogCollector::Entry MakeStartLogEntryWithURL(int source_id,
                                                     const std::string& url) {
   return PassiveLogCollector::Entry(
       0,
       NetLog::TYPE_URL_REQUEST_START,
       base::TimeTicks(),
       NetLog::Source(kSourceType, source_id),
       NetLog::PHASE_BEGIN,
-      new net::NetLogStringParameter(url));
+      new net::NetLogStringParameter("url", url));
 }
 
 PassiveLogCollector::Entry MakeStartLogEntry(int source_id) {
   return MakeStartLogEntryWithURL(source_id,
                                   StringPrintf("http://req%d", source_id));
 }
 
 PassiveLogCollector::Entry MakeEndLogEntry(int source_id) {
   return PassiveLogCollector::Entry(
       0,
       NetLog::TYPE_REQUEST_ALIVE,
       base::TimeTicks(),
       NetLog::Source(kSourceType, source_id),
       NetLog::PHASE_END,
       NULL);
 }
 
 void AddStartURLRequestEntries(PassiveLogCollector* collector, uint32 id) {
   collector->OnAddEntry(NetLog::TYPE_REQUEST_ALIVE, base::TimeTicks(),
                         NetLog::Source(NetLog::SOURCE_URL_REQUEST, id),
                         NetLog::PHASE_BEGIN, NULL);
   collector->OnAddEntry(NetLog::TYPE_URL_REQUEST_START, base::TimeTicks(),
                         NetLog::Source(NetLog::SOURCE_URL_REQUEST, id),
                         NetLog::PHASE_BEGIN, new net::NetLogStringParameter(
-                            StringPrintf("http://req%d", id)));
+                            "url", StringPrintf("http://req%d", id)));
 }
 
 void AddEndURLRequestEntries(PassiveLogCollector* collector, uint32 id) {
   collector->OnAddEntry(NetLog::TYPE_REQUEST_ALIVE, base::TimeTicks(),
                         NetLog::Source(NetLog::SOURCE_URL_REQUEST, id),
                         NetLog::PHASE_END, NULL);
 }
 
+std::string GetStringParam(const PassiveLogCollector::Entry& entry) {
+  return static_cast<net::NetLogStringParameter*>(
+      entry.extra_parameters.get())->value();
+}
+
 static const int kMaxNumLoadLogEntries = 1;
 
 }  // namespace
 
 TEST(RequestTrackerTest, BasicBounded) {
   RequestTracker tracker(NULL, NULL);
   EXPECT_FALSE(tracker.is_unbounded());
   EXPECT_EQ(0u, tracker.GetLiveRequests().size());
   EXPECT_EQ(0u, tracker.GetRecentlyDeceased().size());
 
@@ skipping 152 matching lines @@
   requests = log.url_request_tracker()->GetLiveRequests();
   EXPECT_EQ(2u, requests.size());
 
   EXPECT_EQ(10u, requests[0].source_id);
   EXPECT_EQ(2u, requests[0].entries.size());
   EXPECT_EQ(20u, requests[1].source_id);
   EXPECT_EQ(2u, requests[1].entries.size());
 
   log.OnAddEntry(NetLog::TYPE_SOCKET_POOL_CONNECT_JOB_ID , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_URL_REQUEST, 10),
-                 NetLog::PHASE_BEGIN, new net::NetLogIntegerParameter(11));
+                 NetLog::PHASE_BEGIN, new net::NetLogIntegerParameter("x", 11));
   log.OnAddEntry(NetLog::TYPE_SOCKET_POOL_CONNECT_JOB , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_CONNECT_JOB, 11),
                  NetLog::PHASE_BEGIN, NULL);
 
   log.OnAddEntry(NetLog::TYPE_SOCKET_POOL_CONNECT_JOB_ID , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_URL_REQUEST, 20),
-                 NetLog::PHASE_BEGIN, new net::NetLogIntegerParameter(21));
+                 NetLog::PHASE_BEGIN, new net::NetLogIntegerParameter("x", 21));
   log.OnAddEntry(NetLog::TYPE_SOCKET_POOL_CONNECT_JOB , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_CONNECT_JOB, 21),
                  NetLog::PHASE_BEGIN, NULL);
   log.OnAddEntry(NetLog::TYPE_SOCKET_POOL_CONNECT_JOB , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_CONNECT_JOB, 21),
                  NetLog::PHASE_END, NULL);
 
   requests = log.url_request_tracker()->GetLiveRequests();
   EXPECT_EQ(2u, requests.size());
 
@@ skipping 16 matching lines @@
   PassiveLogCollector log;
 
   RequestInfoList requests = log.url_request_tracker()->GetLiveRequests();
   EXPECT_EQ(0u, requests.size());
 
   AddStartURLRequestEntries(&log, 10);
   AddStartURLRequestEntries(&log, 20);
 
   log.OnAddEntry(NetLog::TYPE_SOCKET_POOL_CONNECT_JOB_ID , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_URL_REQUEST, 10),
-                 NetLog::PHASE_BEGIN, new net::NetLogIntegerParameter(11));
+                 NetLog::PHASE_BEGIN, new net::NetLogIntegerParameter("x", 11));
   log.OnAddEntry(NetLog::TYPE_SOCKET_POOL_CONNECT_JOB , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_CONNECT_JOB, 11),
                  NetLog::PHASE_BEGIN, NULL);
   log.OnAddEntry(NetLog::TYPE_SOCKET_POOL_CONNECT_JOB , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_CONNECT_JOB, 11),
                  NetLog::PHASE_END, NULL);
 
   log.OnAddEntry(NetLog::TYPE_SOCKET_POOL_CONNECT_JOB_ID , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_URL_REQUEST, 20),
-                 NetLog::PHASE_BEGIN, new net::NetLogIntegerParameter(21));
+                 NetLog::PHASE_BEGIN, new net::NetLogIntegerParameter("x", 21));
   log.OnAddEntry(NetLog::TYPE_SOCKET_POOL_CONNECT_JOB , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_CONNECT_JOB, 21),
                  NetLog::PHASE_BEGIN, NULL);
   log.OnAddEntry(NetLog::TYPE_TCP_CONNECT , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_CONNECT_JOB, 21),
                  NetLog::PHASE_NONE, NULL);
   log.OnAddEntry(NetLog::TYPE_SOCKET_POOL_CONNECT_JOB , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_CONNECT_JOB, 21),
                  NetLog::PHASE_END, NULL);
 
   requests = log.url_request_tracker()->GetLiveRequests();
   EXPECT_EQ(2u, requests.size());
 
   EXPECT_EQ(5u, requests[0].entries.size());
   EXPECT_EQ(6u, requests[1].entries.size());
 
   log.OnAddEntry(NetLog::TYPE_SOCKET_POOL_CONNECT_JOB_ID , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_URL_REQUEST, 10),
-                 NetLog::PHASE_END, new net::NetLogIntegerParameter(11));
+                 NetLog::PHASE_END, new net::NetLogIntegerParameter("x", 11));
   log.OnAddEntry(NetLog::TYPE_SOCKET_POOL_CONNECT_JOB_ID , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_URL_REQUEST, 20),
-                 NetLog::PHASE_END, new net::NetLogIntegerParameter(21));
+                 NetLog::PHASE_END, new net::NetLogIntegerParameter("x", 21));
 
   requests = log.url_request_tracker()->GetLiveRequests();
   EXPECT_EQ(2u, requests.size());
 
   EXPECT_EQ(6u, requests[0].entries.size());
   EXPECT_EQ(7u, requests[1].entries.size());
 
   log.OnAddEntry(NetLog::TYPE_SOCKET_POOL_SOCKET_ID , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_URL_REQUEST, 10),
-                 NetLog::PHASE_END, new net::NetLogIntegerParameter(15));
+                 NetLog::PHASE_END, new net::NetLogIntegerParameter("x", 15));
   log.OnAddEntry(NetLog::TYPE_SOCKET_POOL_SOCKET_ID , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_URL_REQUEST, 20),
-                 NetLog::PHASE_END, new net::NetLogIntegerParameter(25));
+                 NetLog::PHASE_END, new net::NetLogIntegerParameter("x", 25));
 
   log.OnAddEntry(NetLog::TYPE_SOCKS_CONNECT , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_SOCKET, 15),
                  NetLog::PHASE_NONE, NULL);
   log.OnAddEntry(NetLog::TYPE_SSL_CONNECT , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_SOCKET, 25),
                  NetLog::PHASE_BEGIN, NULL);
   log.OnAddEntry(NetLog::TYPE_SSL_CONNECT , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_SOCKET, 25),
                  NetLog::PHASE_END, NULL);
@@ skipping 36 matching lines @@
                  NetLog::PHASE_NONE, NULL);
 
   requests = log.url_request_tracker()->GetLiveRequests();
   EXPECT_EQ(2u, requests.size());
 
   EXPECT_EQ(2u, requests[0].entries.size());
   EXPECT_EQ(3u, requests[1].entries.size());
 
   log.OnAddEntry(NetLog::TYPE_SOCKET_POOL_SOCKET_ID , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_URL_REQUEST, 10),
-                 NetLog::PHASE_END, new net::NetLogIntegerParameter(15));
+                 NetLog::PHASE_END, new net::NetLogIntegerParameter("x", 15));
   log.OnAddEntry(NetLog::TYPE_SOCKET_POOL_SOCKET_ID , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_URL_REQUEST, 20),
-                 NetLog::PHASE_END, new net::NetLogIntegerParameter(25));
+                 NetLog::PHASE_END, new net::NetLogIntegerParameter("x", 25));
 
   log.OnAddEntry(NetLog::TYPE_SOCKS_CONNECT , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_SOCKET, 15),
                  NetLog::PHASE_NONE, NULL);
   log.OnAddEntry(NetLog::TYPE_SSL_CONNECT , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_SOCKET, 25),
                  NetLog::PHASE_BEGIN, NULL);
   log.OnAddEntry(NetLog::TYPE_SSL_CONNECT , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_SOCKET, 25),
                  NetLog::PHASE_END, NULL);
@@ skipping 27 matching lines @@
   PassiveLogCollector log;
 
   RequestInfoList requests = log.url_request_tracker()->GetLiveRequests();
   EXPECT_EQ(0u, requests.size());
 
   AddStartURLRequestEntries(&log, 10);
   AddStartURLRequestEntries(&log, 20);
 
   log.OnAddEntry(NetLog::TYPE_SOCKET_POOL_CONNECT_JOB_ID , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_URL_REQUEST, 10),
-                 NetLog::PHASE_BEGIN, new net::NetLogIntegerParameter(11));
+                 NetLog::PHASE_BEGIN, new net::NetLogIntegerParameter("x", 11));
   log.OnAddEntry(NetLog::TYPE_SOCKET_POOL_CONNECT_JOB , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_CONNECT_JOB, 11),
                  NetLog::PHASE_BEGIN, NULL);
   log.OnAddEntry(NetLog::TYPE_SOCKET_POOL_CONNECT_JOB , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_CONNECT_JOB, 11),
                  NetLog::PHASE_END, NULL);
 
   log.OnAddEntry(NetLog::TYPE_SOCKET_POOL_CONNECT_JOB_ID , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_URL_REQUEST, 20),
-                 NetLog::PHASE_BEGIN, new net::NetLogIntegerParameter(21));
+                 NetLog::PHASE_BEGIN, new net::NetLogIntegerParameter("x", 21));
   log.OnAddEntry(NetLog::TYPE_SOCKET_POOL_CONNECT_JOB , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_CONNECT_JOB, 21),
                  NetLog::PHASE_BEGIN, NULL);
   log.OnAddEntry(NetLog::TYPE_TCP_CONNECT , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_CONNECT_JOB, 21),
                  NetLog::PHASE_NONE, NULL);
   log.OnAddEntry(NetLog::TYPE_SOCKET_POOL_CONNECT_JOB , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_CONNECT_JOB, 21),
                  NetLog::PHASE_END, NULL);
 
   requests = log.url_request_tracker()->GetLiveRequests();
   EXPECT_EQ(2u, requests.size());
 
   EXPECT_EQ(5u, requests[0].entries.size());
   EXPECT_EQ(6u, requests[1].entries.size());
 
   log.OnAddEntry(NetLog::TYPE_SOCKET_POOL_SOCKET_ID , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_URL_REQUEST, 10),
-                 NetLog::PHASE_END, new net::NetLogIntegerParameter(15));
+                 NetLog::PHASE_END, new net::NetLogIntegerParameter("x", 15));
   log.OnAddEntry(NetLog::TYPE_SOCKET_POOL_SOCKET_ID , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_URL_REQUEST, 20),
-                 NetLog::PHASE_END, new net::NetLogIntegerParameter(25));
+                 NetLog::PHASE_END, new net::NetLogIntegerParameter("x", 25));
 
   log.OnAddEntry(NetLog::TYPE_SOCKS_CONNECT , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_SOCKET, 15),
                  NetLog::PHASE_NONE, NULL);
   log.OnAddEntry(NetLog::TYPE_SSL_CONNECT , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_SOCKET, 25),
                  NetLog::PHASE_BEGIN, NULL);
   log.OnAddEntry(NetLog::TYPE_SSL_CONNECT , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_SOCKET, 25),
                  NetLog::PHASE_END, NULL);
@@ skipping 27 matching lines @@
   PassiveLogCollector log;
 
   RequestInfoList requests = log.url_request_tracker()->GetLiveRequests();
   EXPECT_EQ(0u, requests.size());
 
   AddStartURLRequestEntries(&log, 10);
   AddStartURLRequestEntries(&log, 20);
 
   log.OnAddEntry(NetLog::TYPE_SOCKET_POOL_CONNECT_JOB_ID , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_URL_REQUEST, 10),
-                 NetLog::PHASE_BEGIN, new net::NetLogIntegerParameter(11));
+                 NetLog::PHASE_BEGIN, new net::NetLogIntegerParameter("x", 11));
   log.OnAddEntry(NetLog::TYPE_SOCKET_POOL_CONNECT_JOB , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_CONNECT_JOB, 11),
                  NetLog::PHASE_BEGIN, NULL);
   log.OnAddEntry(NetLog::TYPE_SOCKET_POOL_CONNECT_JOB , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_CONNECT_JOB, 11),
                  NetLog::PHASE_END, NULL);
 
   log.OnAddEntry(NetLog::TYPE_SOCKET_POOL_CONNECT_JOB_ID , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_URL_REQUEST, 20),
-                 NetLog::PHASE_BEGIN, new net::NetLogIntegerParameter(21));
+                 NetLog::PHASE_BEGIN, new net::NetLogIntegerParameter("x", 21));
   log.OnAddEntry(NetLog::TYPE_SOCKET_POOL_CONNECT_JOB , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_CONNECT_JOB, 21),
                  NetLog::PHASE_BEGIN, NULL);
   log.OnAddEntry(NetLog::TYPE_TCP_CONNECT , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_CONNECT_JOB, 21),
                  NetLog::PHASE_NONE, NULL);
   log.OnAddEntry(NetLog::TYPE_SOCKET_POOL_CONNECT_JOB , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_CONNECT_JOB, 21),
                  NetLog::PHASE_END, NULL);
 
@@ skipping 11 matching lines @@
                  NetLog::PHASE_END, NULL);
 
   requests = log.url_request_tracker()->GetLiveRequests();
   EXPECT_EQ(2u, requests.size());
 
   EXPECT_EQ(5u, requests[0].entries.size());
   EXPECT_EQ(6u, requests[1].entries.size());
 
   log.OnAddEntry(NetLog::TYPE_SOCKET_POOL_CONNECT_JOB_ID , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_URL_REQUEST, 10),
-                 NetLog::PHASE_END, new net::NetLogIntegerParameter(21));
+                 NetLog::PHASE_END, new net::NetLogIntegerParameter("x", 21));
   log.OnAddEntry(NetLog::TYPE_SOCKET_POOL_CONNECT_JOB_ID , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_URL_REQUEST, 20),
-                 NetLog::PHASE_END, new net::NetLogIntegerParameter(31));
+                 NetLog::PHASE_END, new net::NetLogIntegerParameter("x", 31));
 
   requests = log.url_request_tracker()->GetLiveRequests();
   EXPECT_EQ(2u, requests.size());
 
   EXPECT_EQ(7u, requests[0].entries.size());
   EXPECT_EQ(8u, requests[1].entries.size());
 
   log.OnAddEntry(NetLog::TYPE_SOCKET_POOL_SOCKET_ID , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_URL_REQUEST, 10),
-                 NetLog::PHASE_END, new net::NetLogIntegerParameter(15));
+                 NetLog::PHASE_END, new net::NetLogIntegerParameter("x", 15));
   log.OnAddEntry(NetLog::TYPE_SOCKET_POOL_SOCKET_ID , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_URL_REQUEST, 20),
-                 NetLog::PHASE_END, new net::NetLogIntegerParameter(25));
+                 NetLog::PHASE_END, new net::NetLogIntegerParameter("x", 25));
 
   log.OnAddEntry(NetLog::TYPE_SOCKS_CONNECT , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_SOCKET, 15),
                  NetLog::PHASE_NONE, NULL);
   log.OnAddEntry(NetLog::TYPE_SSL_CONNECT , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_SOCKET, 25),
                  NetLog::PHASE_BEGIN, NULL);
   log.OnAddEntry(NetLog::TYPE_SSL_CONNECT , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_SOCKET, 25),
                  NetLog::PHASE_END, NULL);
@@ skipping 50 matching lines @@
                  NetLog::PHASE_END, NULL);
 
   requests = log.url_request_tracker()->GetLiveRequests();
   EXPECT_EQ(2u, requests.size());
 
   EXPECT_EQ(2u, requests[0].entries.size());
   EXPECT_EQ(2u, requests[1].entries.size());
 
   log.OnAddEntry(NetLog::TYPE_SOCKET_POOL_CONNECT_JOB_ID , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_URL_REQUEST, 10),
-                 NetLog::PHASE_END, new net::NetLogIntegerParameter(11));
+                 NetLog::PHASE_END, new net::NetLogIntegerParameter("x", 11));
   log.OnAddEntry(NetLog::TYPE_SOCKET_POOL_CONNECT_JOB_ID , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_URL_REQUEST, 20),
-                 NetLog::PHASE_END, new net::NetLogIntegerParameter(21));
+                 NetLog::PHASE_END, new net::NetLogIntegerParameter("x", 21));
 
   requests = log.url_request_tracker()->GetLiveRequests();
   EXPECT_EQ(2u, requests.size());
 
   EXPECT_EQ(5u, requests[0].entries.size());
   EXPECT_EQ(6u, requests[1].entries.size());
 
   log.OnAddEntry(NetLog::TYPE_SOCKET_POOL_SOCKET_ID , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_URL_REQUEST, 10),
-                 NetLog::PHASE_END, new net::NetLogIntegerParameter(15));
+                 NetLog::PHASE_END, new net::NetLogIntegerParameter("x", 15));
   log.OnAddEntry(NetLog::TYPE_SOCKET_POOL_SOCKET_ID , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_URL_REQUEST, 20),
-                 NetLog::PHASE_END, new net::NetLogIntegerParameter(25));
+                 NetLog::PHASE_END, new net::NetLogIntegerParameter("x", 25));
 
   log.OnAddEntry(NetLog::TYPE_SOCKS_CONNECT , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_SOCKET, 15),
                  NetLog::PHASE_NONE, NULL);
   log.OnAddEntry(NetLog::TYPE_SSL_CONNECT , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_SOCKET, 25),
                  NetLog::PHASE_BEGIN, NULL);
   log.OnAddEntry(NetLog::TYPE_SSL_CONNECT , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_SOCKET, 25),
                  NetLog::PHASE_END, NULL);
@@ skipping 27 matching lines @@
   PassiveLogCollector log;
 
   RequestInfoList requests = log.url_request_tracker()->GetLiveRequests();
   EXPECT_EQ(0u, requests.size());
 
   AddStartURLRequestEntries(&log, 10);
 
   // Initial socket.
   log.OnAddEntry(NetLog::TYPE_SOCKET_POOL_SOCKET_ID , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_URL_REQUEST, 10),
-                 NetLog::PHASE_END, new net::NetLogIntegerParameter(15));
+                 NetLog::PHASE_END, new net::NetLogIntegerParameter("x", 15));
   log.OnAddEntry(NetLog::TYPE_SOCKS_CONNECT , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_SOCKET, 15),
                  NetLog::PHASE_NONE, NULL);
 
   requests = log.url_request_tracker()->GetLiveRequests();
   EXPECT_EQ(1u, requests.size());
   EXPECT_EQ(4u, requests[0].entries.size());
 
   // Reconnect.
   log.OnAddEntry(NetLog::TYPE_SOCKET_POOL_SOCKET_ID , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_URL_REQUEST, 10),
-                 NetLog::PHASE_END, new net::NetLogIntegerParameter(17));
+                 NetLog::PHASE_END, new net::NetLogIntegerParameter("x", 17));
   log.OnAddEntry(NetLog::TYPE_SOCKS_CONNECT , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_SOCKET, 17),
                  NetLog::PHASE_NONE, NULL);
 
   requests = log.url_request_tracker()->GetLiveRequests();
   EXPECT_EQ(1u, requests.size());
   EXPECT_EQ(6u, requests[0].entries.size());
 
   AddEndURLRequestEntries(&log, 10);
 
@@ skipping 13 matching lines @@
   PassiveLogCollector log;
 
   RequestInfoList requests = log.url_request_tracker()->GetLiveRequests();
   EXPECT_EQ(0u, requests.size());
 
   AddStartURLRequestEntries(&log, 10);
 
   // Initial socket.
   log.OnAddEntry(NetLog::TYPE_SOCKET_POOL_SOCKET_ID , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_URL_REQUEST, 10),
-                 NetLog::PHASE_END, new net::NetLogIntegerParameter(15));
+                 NetLog::PHASE_END, new net::NetLogIntegerParameter("x", 15));
   log.OnAddEntry(NetLog::TYPE_SOCKS_CONNECT , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_SOCKET, 15),
                  NetLog::PHASE_NONE, NULL);
 
   requests = log.url_request_tracker()->GetLiveRequests();
   EXPECT_EQ(1u, requests.size());
   EXPECT_EQ(4u, requests[0].entries.size());
 
   // Now reconnect.
   log.OnAddEntry(NetLog::TYPE_SOCKET_POOL_CONNECT_JOB_ID , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_URL_REQUEST, 10),
-                 NetLog::PHASE_BEGIN, new net::NetLogIntegerParameter(11));
+                 NetLog::PHASE_BEGIN, new net::NetLogIntegerParameter("x", 11));
   log.OnAddEntry(NetLog::TYPE_SOCKET_POOL_CONNECT_JOB , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_CONNECT_JOB, 11),
                  NetLog::PHASE_BEGIN, NULL);
 
   requests = log.url_request_tracker()->GetLiveRequests();
   EXPECT_EQ(1u, requests.size());
   EXPECT_EQ(6u, requests[0].entries.size());
 
   // But we get late bound to an idle socket.
   log.OnAddEntry(NetLog::TYPE_SOCKET_POOL_SOCKET_ID , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_URL_REQUEST, 10),
-                 NetLog::PHASE_END, new net::NetLogIntegerParameter(17));
+                 NetLog::PHASE_END, new net::NetLogIntegerParameter("x", 17));
   log.OnAddEntry(NetLog::TYPE_SOCKS_CONNECT , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_SOCKET, 17),
                  NetLog::PHASE_NONE, NULL);
 
   requests = log.url_request_tracker()->GetLiveRequests();
   EXPECT_EQ(1u, requests.size());
   EXPECT_EQ(7u, requests[0].entries.size());
 
   AddEndURLRequestEntries(&log, 10);
 
@@ skipping 13 matching lines @@
   PassiveLogCollector log;
 
   RequestInfoList requests = log.url_request_tracker()->GetLiveRequests();
   EXPECT_EQ(0u, requests.size());
 
   AddStartURLRequestEntries(&log, 10);
 
   // Initial socket.
   log.OnAddEntry(NetLog::TYPE_SOCKET_POOL_SOCKET_ID , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_URL_REQUEST, 10),
-                 NetLog::PHASE_END, new net::NetLogIntegerParameter(15));
+                 NetLog::PHASE_END, new net::NetLogIntegerParameter("x", 15));
   log.OnAddEntry(NetLog::TYPE_SOCKS_CONNECT , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_SOCKET, 15),
                  NetLog::PHASE_NONE, NULL);
 
   requests = log.url_request_tracker()->GetLiveRequests();
   EXPECT_EQ(1u, requests.size());
   EXPECT_EQ(4u, requests[0].entries.size());
 
   // Now reconnect.
   log.OnAddEntry(NetLog::TYPE_SOCKET_POOL_CONNECT_JOB_ID , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_URL_REQUEST, 10),
-                 NetLog::PHASE_BEGIN, new net::NetLogIntegerParameter(11));
+                 NetLog::PHASE_BEGIN, new net::NetLogIntegerParameter("x", 11));
   log.OnAddEntry(NetLog::TYPE_SOCKET_POOL_CONNECT_JOB , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_CONNECT_JOB, 11),
                  NetLog::PHASE_BEGIN, NULL);
 
   requests = log.url_request_tracker()->GetLiveRequests();
   EXPECT_EQ(1u, requests.size());
   EXPECT_EQ(6u, requests[0].entries.size());
 
   // But we get late bound to a different ConnectJob.
   log.OnAddEntry(NetLog::TYPE_SOCKET_POOL_CONNECT_JOB , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_CONNECT_JOB, 12),
                  NetLog::PHASE_BEGIN, NULL);
   log.OnAddEntry(NetLog::TYPE_SOCKET_POOL_CONNECT_JOB , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_CONNECT_JOB, 12),
                  NetLog::PHASE_END, NULL);
   log.OnAddEntry(NetLog::TYPE_SOCKET_POOL_CONNECT_JOB_ID , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_URL_REQUEST, 10),
-                 NetLog::PHASE_END, new net::NetLogIntegerParameter(12));
+                 NetLog::PHASE_END, new net::NetLogIntegerParameter("x", 12));
 
   requests = log.url_request_tracker()->GetLiveRequests();
   EXPECT_EQ(1u, requests.size());
   EXPECT_EQ(8u, requests[0].entries.size());
 
   log.OnAddEntry(NetLog::TYPE_SOCKET_POOL_SOCKET_ID , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_URL_REQUEST, 10),
-                 NetLog::PHASE_END, new net::NetLogIntegerParameter(17));
+                 NetLog::PHASE_END, new net::NetLogIntegerParameter("x", 17));
   log.OnAddEntry(NetLog::TYPE_SOCKS_CONNECT , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_SOCKET, 17),
                  NetLog::PHASE_NONE, NULL);
 
   requests = log.url_request_tracker()->GetLiveRequests();
   EXPECT_EQ(1u, requests.size());
   EXPECT_EQ(10u, requests[0].entries.size());
 
   AddEndURLRequestEntries(&log, 10);
 
@@ skipping 12 matching lines @@
 TEST(PassiveLogCollectorTest, LostConnectJob) {
   PassiveLogCollector log;
 
   RequestInfoList requests = log.url_request_tracker()->GetLiveRequests();
   EXPECT_EQ(0u, requests.size());
 
   AddStartURLRequestEntries(&log, 10);
 
   log.OnAddEntry(NetLog::TYPE_SOCKET_POOL_CONNECT_JOB_ID , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_URL_REQUEST, 10),
-                 NetLog::PHASE_BEGIN, new net::NetLogIntegerParameter(11));
+                 NetLog::PHASE_BEGIN, new net::NetLogIntegerParameter("x", 11));
   log.OnAddEntry(NetLog::TYPE_SOCKET_POOL_CONNECT_JOB , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_CONNECT_JOB, 11),
                  NetLog::PHASE_BEGIN, NULL);
   log.OnAddEntry(NetLog::TYPE_SOCKS_CONNECT , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_CONNECT_JOB, 11),
                  NetLog::PHASE_NONE, NULL);
   log.OnAddEntry(NetLog::TYPE_SOCKET_POOL_CONNECT_JOB , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_CONNECT_JOB, 11),
                  NetLog::PHASE_END, NULL);
 
   requests = log.url_request_tracker()->GetLiveRequests();
   EXPECT_EQ(1u, requests.size());
   EXPECT_EQ(6u, requests[0].entries.size());
 
   log.connect_job_tracker_.Clear();
 
   log.OnAddEntry(NetLog::TYPE_SOCKET_POOL_CONNECT_JOB_ID , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_URL_REQUEST, 10),
-                 NetLog::PHASE_END, new net::NetLogIntegerParameter(11));
+                 NetLog::PHASE_END, new net::NetLogIntegerParameter("x", 11));
 
   requests = log.url_request_tracker()->GetLiveRequests();
   EXPECT_EQ(1u, requests.size());
   EXPECT_EQ(5u, requests[0].entries.size());
 }
 
 TEST(PassiveLogCollectorTest, LostSocket) {
   PassiveLogCollector log;
 
   RequestInfoList requests = log.url_request_tracker()->GetLiveRequests();
   EXPECT_EQ(0u, requests.size());
 
   AddStartURLRequestEntries(&log, 10);
 
   log.OnAddEntry(NetLog::TYPE_SOCKET_POOL_SOCKET_ID , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_URL_REQUEST, 10),
-                 NetLog::PHASE_END, new net::NetLogIntegerParameter(15));
+                 NetLog::PHASE_END, new net::NetLogIntegerParameter("x", 15));
   log.OnAddEntry(NetLog::TYPE_SOCKS_CONNECT , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_SOCKET, 15),
                  NetLog::PHASE_BEGIN, NULL);
   log.OnAddEntry(NetLog::TYPE_SOCKS_CONNECT , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_SOCKET, 15),
                  NetLog::PHASE_END, NULL);
   log.OnAddEntry(NetLog::TYPE_SSL_CONNECT , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_SOCKET, 15),
                  NetLog::PHASE_BEGIN, NULL);
   log.OnAddEntry(NetLog::TYPE_SSL_CONNECT , base::TimeTicks(),
@@ skipping 14 matching lines @@
 TEST(PassiveLogCollectorTest, AccumulateRxTxData) {
   PassiveLogCollector log;
 
   RequestInfoList requests = log.url_request_tracker()->GetLiveRequests();
   EXPECT_EQ(0u, requests.size());
 
   AddStartURLRequestEntries(&log, 10);
 
   log.OnAddEntry(NetLog::TYPE_SOCKET_POOL_SOCKET_ID , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_URL_REQUEST, 10),
-                 NetLog::PHASE_END, new net::NetLogIntegerParameter(15));
+                 NetLog::PHASE_END, new net::NetLogIntegerParameter("x", 15));
   log.OnAddEntry(NetLog::TYPE_SOCKS_CONNECT , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_SOCKET, 15),
                  NetLog::PHASE_NONE, NULL);
 
   requests = log.url_request_tracker()->GetLiveRequests();
   EXPECT_EQ(1u, requests.size());
   EXPECT_EQ(4u, requests[0].entries.size());
 
   log.OnAddEntry(NetLog::TYPE_SOCKET_BYTES_SENT , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_SOCKET, 15),
-                 NetLog::PHASE_END, new net::NetLogIntegerParameter(1));
+                 NetLog::PHASE_END, new net::NetLogIntegerParameter("x", 1));
   requests = log.url_request_tracker()->GetLiveRequests();
   EXPECT_EQ(1u, requests.size());
   EXPECT_EQ(5u, requests[0].entries.size());
   EXPECT_EQ(NetLog::TYPE_TODO_STRING, requests[0].entries[4].type);
   EXPECT_EQ("Tx/Rx: 1/0 [1/0 total on socket] (Bytes)",
-            requests[0].entries[4].extra_parameters->ToString());
+            GetStringParam(requests[0].entries[4]));
 
   log.OnAddEntry(NetLog::TYPE_SOCKET_BYTES_RECEIVED , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_SOCKET, 15),
-                 NetLog::PHASE_END, new net::NetLogIntegerParameter(2));
+                 NetLog::PHASE_END, new net::NetLogIntegerParameter("x", 2));
   requests = log.url_request_tracker()->GetLiveRequests();
   EXPECT_EQ(1u, requests.size());
   EXPECT_EQ(5u, requests[0].entries.size());
   EXPECT_EQ(NetLog::TYPE_TODO_STRING, requests[0].entries[4].type);
   EXPECT_EQ("Tx/Rx: 1/2 [1/2 total on socket] (Bytes)",
-            requests[0].entries[4].extra_parameters->ToString());
+            GetStringParam(requests[0].entries[4]));
 
   AddEndURLRequestEntries(&log, 10);
   requests = log.url_request_tracker()->GetLiveRequests();
   EXPECT_EQ(0u, requests.size());
   requests = log.url_request_tracker()->GetRecentlyDeceased();
   EXPECT_EQ(1u, requests.size());
   EXPECT_EQ(6u, requests[0].entries.size());
   EXPECT_EQ(NetLog::TYPE_TODO_STRING, requests[0].entries[4].type);
   EXPECT_EQ("Tx/Rx: 1/2 [1/2 total on socket] (Bytes)",
-            requests[0].entries[4].extra_parameters->ToString());
+            GetStringParam(requests[0].entries[4]));
 
   AddStartURLRequestEntries(&log, 20);
 
   log.OnAddEntry(NetLog::TYPE_SOCKET_POOL_SOCKET_ID , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_URL_REQUEST, 20),
-                 NetLog::PHASE_END, new net::NetLogIntegerParameter(15));
+                 NetLog::PHASE_END, new net::NetLogIntegerParameter("x", 15));
   log.OnAddEntry(NetLog::TYPE_SOCKS_CONNECT , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_SOCKET, 15),
                  NetLog::PHASE_NONE, NULL);
 
   requests = log.url_request_tracker()->GetLiveRequests();
   EXPECT_EQ(1u, requests.size());
   EXPECT_EQ(4u, requests[0].entries.size());
 
   log.OnAddEntry(NetLog::TYPE_SOCKET_BYTES_SENT , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_SOCKET, 15),
-                 NetLog::PHASE_END, new net::NetLogIntegerParameter(4));
+                 NetLog::PHASE_END, new net::NetLogIntegerParameter("x", 4));
   log.OnAddEntry(NetLog::TYPE_SOCKET_BYTES_RECEIVED , base::TimeTicks(),
                  NetLog::Source(NetLog::SOURCE_SOCKET, 15),
-                 NetLog::PHASE_END, new net::NetLogIntegerParameter(8));
+                 NetLog::PHASE_END, new net::NetLogIntegerParameter("x", 8));
   requests = log.url_request_tracker()->GetLiveRequests();
   EXPECT_EQ(1u, requests.size());
   EXPECT_EQ(5u, requests[0].entries.size());
   EXPECT_EQ(NetLog::TYPE_TODO_STRING, requests[0].entries[4].type);
   EXPECT_EQ("Tx/Rx: 4/8 [5/10 total on socket] (Bytes)",
-            requests[0].entries[4].extra_parameters->ToString());
+            GetStringParam(requests[0].entries[4]));
 
   AddEndURLRequestEntries(&log, 20);
   requests = log.url_request_tracker()->GetLiveRequests();
   EXPECT_EQ(0u, requests.size());
   requests = log.url_request_tracker()->GetRecentlyDeceased();
   EXPECT_EQ(2u, requests.size());
   EXPECT_EQ(6u, requests[0].entries.size());
   EXPECT_EQ(6u, requests[1].entries.size());
 }