Add support for attaching custom parameters to NetLog events.

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;
 
 const net::NetLog::SourceType kSourceType = net::NetLog::SOURCE_NONE;
 
-net::NetLog::Entry MakeStartLogEntryWithURL(int source_id,
-                                            const std::string& url) {
-  net::NetLog::Entry entry;
-  entry.source.type = kSourceType;
-  entry.source.id = source_id;
-  entry.type = net::NetLog::Entry::TYPE_EVENT;
-  entry.event = net::NetLog::Event(net::NetLog::TYPE_REQUEST_ALIVE,
-                                   net::NetLog::PHASE_BEGIN);
-  entry.string = url;
-  return entry;
+net::CapturingNetLog::Entry MakeStartLogEntryWithURL(int source_id,
+                                                     const std::string& url) {
+  return net::CapturingNetLog::Entry(
+      net::NetLog::TYPE_URL_REQUEST_START,
+      base::TimeTicks(),
+      net::NetLog::Source(kSourceType, source_id),
+      net::NetLog::PHASE_BEGIN,
+      new net::NetLogStringParameter(url));
 }
 
-net::NetLog::Entry MakeStartLogEntry(int source_id) {
+net::CapturingNetLog::Entry MakeStartLogEntry(int source_id) {
   return MakeStartLogEntryWithURL(source_id,
                                   StringPrintf("http://req%d", source_id));
 }
 
-net::NetLog::Entry MakeEndLogEntry(int source_id) {
-  net::NetLog::Entry entry;
-  entry.source.type = kSourceType;
-  entry.source.id = source_id;
-  entry.type = net::NetLog::Entry::TYPE_EVENT;
-  entry.event = net::NetLog::Event(net::NetLog::TYPE_REQUEST_ALIVE,
-                                   net::NetLog::PHASE_END);
-  return entry;
+net::CapturingNetLog::Entry MakeEndLogEntry(int source_id) {
+  return net::CapturingNetLog::Entry(
+      net::NetLog::TYPE_REQUEST_ALIVE,
+      base::TimeTicks(),
+      net::NetLog::Source(kSourceType, source_id),
+      net::NetLog::PHASE_END,
+      NULL);
 }
 
 static const int kMaxNumLoadLogEntries = 1;
 
 TEST(RequestTrackerTest, BasicBounded) {
   RequestTracker tracker(NULL);
   EXPECT_FALSE(tracker.IsUnbounded());
   EXPECT_EQ(0u, tracker.GetLiveRequests().size());
   EXPECT_EQ(0u, tracker.GetRecentlyDeceased().size());
 
@@ skipping 73 matching lines @@
   RequestInfoList recent_reqs = tracker.GetRecentlyDeceased();
 
   ASSERT_EQ(kMaxSize, recent_reqs.size());
 
   for (size_t i = 0; i < kMaxSize; ++i) {
     std::string url = StringPrintf("http://req%" PRIuS, i);
     EXPECT_EQ(url, recent_reqs[i].url);
   }
 }
 
-// Check that very long URLs are truncated.
-TEST(RequestTrackerTest, GraveyardURLBounded) {
-  RequestTracker tracker(NULL);
-  EXPECT_FALSE(tracker.IsUnbounded());
-
-  std::string big_url("http://");
-  big_url.resize(2 * RequestTracker::kMaxGraveyardURLSize, 'x');
-
-  tracker.OnAddEntry(MakeStartLogEntryWithURL(1, big_url));
-  tracker.OnAddEntry(MakeEndLogEntry(1));
-
-  ASSERT_EQ(1u, tracker.GetRecentlyDeceased().size());
-  EXPECT_EQ(RequestTracker::kMaxGraveyardURLSize,
-            tracker.GetRecentlyDeceased()[0].url.size());
-}
-
 // Check that we exclude "chrome://" URLs from being saved into the recent
 // requests list (graveyard).
 TEST(RequestTrackerTest, GraveyardIsFiltered) {
   RequestTracker tracker(NULL);
   EXPECT_FALSE(tracker.IsUnbounded());
 
   // This will be excluded.
   std::string url1 = "chrome://dontcare/";
   tracker.OnAddEntry(MakeStartLogEntryWithURL(1, url1));
   tracker.OnAddEntry(MakeEndLogEntry(1));
@@ skipping 41 matching lines @@
   for (size_t i = kMaxSize; i < 2 * kMaxSize; ++i) {
     tracker.OnAddEntry(MakeStartLogEntry(i));
     tracker.OnAddEntry(MakeEndLogEntry(i));
   }
 
   // We should only have kMaxGraveyardSize entries now.
   ASSERT_EQ(kMaxSize, tracker.GetRecentlyDeceased().size());
 }
 
 }  // namespace