Add support for attaching custom parameters to NetLog events.

net/base/net_log_unittest.h

 // 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.
 
 #ifndef NET_BASE_NET_LOG_UNITTEST_H_
 #define NET_BASE_NET_LOG_UNITTEST_H_
 
 #include <cstddef>
 #include <vector>
 #include "net/base/net_log.h"
@@ skipping 12 matching lines @@
     const CapturingNetLog::EntryList& entries,
     int i,  // Negative indices are reverse indices.
     const base::TimeTicks& expected_time,
     bool check_time,
     NetLog::EventType expected_event,
     NetLog::EventPhase expected_phase) {
   // Negative indices are reverse indices.
   size_t j = (i < 0) ? entries.size() + i : i;
   if (j >= entries.size())
     return ::testing::AssertionFailure() << j << " is out of bounds.";
-  const NetLog::Entry& entry = entries[j];
-  if (entry.type != NetLog::Entry::TYPE_EVENT)
-    return ::testing::AssertionFailure() << "Not a TYPE_EVENT entry";
-  if (expected_event != entry.event.type) {
+  const CapturingNetLog::Entry& entry = entries[j];
+  if (expected_event != entry.type) {
     return ::testing::AssertionFailure()
-        << "Actual event: " << NetLog::EventTypeToString(entry.event.type)
+        << "Actual event: " << NetLog::EventTypeToString(entry.type)
         << ". Expected event: " << NetLog::EventTypeToString(expected_event)
         << ".";
   }
-  if (expected_phase != entry.event.phase) {
+  if (expected_phase != entry.phase) {
     return ::testing::AssertionFailure()
-        << "Actual phase: " << entry.event.phase
+        << "Actual phase: " << entry.phase
         << ". Expected phase: " << expected_phase << ".";
   }
   if (check_time) {
     if (expected_time != entry.time) {
       return ::testing::AssertionFailure()
           << "Actual time: " << entry.time.ToInternalValue()
           << ". Expected time: " << expected_time.ToInternalValue()
           << ".";
     }
   }
@@ skipping 32 matching lines @@
 inline ::testing::AssertionResult LogContainsEndEvent(
     const CapturingNetLog::EntryList& log,
     int i,  // Negative indices are reverse indices.
     NetLog::EventType expected_event) {
   return LogContainsEvent(log, i, expected_event, NetLog::PHASE_END);
 }
 
 inline ::testing::AssertionResult LogContainsEntryWithType(
     const CapturingNetLog::EntryList& entries,
     int i, // Negative indices are reverse indices.
-    NetLog::Entry::Type type) {
+    NetLog::EventType type) {
   // Negative indices are reverse indices.
   size_t j = (i < 0) ? entries.size() + i : i;
   if (j >= entries.size())
     return ::testing::AssertionFailure() << j << " is out of bounds.";
-  const NetLog::Entry& entry = entries[j];
+  const CapturingNetLog::Entry& entry = entries[j];
   if (entry.type != type)
     return ::testing::AssertionFailure() << "Type does not match.";
   return ::testing::AssertionSuccess();
 }
 
 
 // Expect that the log contains an event, but don't care about where
 // as long as the index where it is found is greater than min_index.
 // Returns the position where the event was found.
 inline size_t ExpectLogContainsSomewhere(
     const CapturingNetLog::EntryList& entries,
     size_t min_index,
     NetLog::EventType expected_event,
     NetLog::EventPhase expected_phase) {
   size_t i = 0;
   for (; i < entries.size(); ++i) {
-    const NetLog::Entry& entry = entries[i];
-    if (entry.type == NetLog::Entry::TYPE_EVENT &&
-        entry.event.type == expected_event &&
-        entry.event.phase == expected_phase)
+    const CapturingNetLog::Entry& entry = entries[i];
+    if (entry.type == expected_event &&
+        entry.phase == expected_phase)
       break;
   }
   EXPECT_LT(i, entries.size());
   EXPECT_GE(i, min_index);
   return i;
 }
 
 }  // namespace net
 
 #endif  // NET_BASE_NET_LOG_UNITTEST_H_