Get rid of TestNetLog::CapturedEntry[List] typedefs.

net/log/net_log_unittest.h

 // Copyright (c) 2012 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_LOG_NET_LOG_UNITTEST_H_
 #define NET_LOG_NET_LOG_UNITTEST_H_
 
 #include <cstddef>
 
+#include "net/log/captured_net_log_entry.h"
 #include "net/log/test_net_log.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 
 // Create a timestamp with internal value of |t| milliseconds from the epoch.
 inline base::TimeTicks MakeTime(int t) {
   base::TimeTicks ticks;  // initialized to 0.
   ticks += base::TimeDelta::FromMilliseconds(t);
   return ticks;
 }
 
 inline ::testing::AssertionResult LogContainsEventHelper(

[mmenke, 2015/04/24 22:31:39]

Think I'll de-inline these in a followup CL.

-    const TestNetLog::CapturedEntryList& entries,
+    const CapturedNetLogEntry::List& 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) ? static_cast<size_t>(static_cast<int>(entries.size()) + i)
                      : static_cast<size_t>(i);
   if (j >= entries.size())
     return ::testing::AssertionFailure() << j << " is out of bounds.";
-  const TestNetLog::CapturedEntry& entry = entries[j];
+  const CapturedNetLogEntry& entry = entries[j];
   if (expected_event != entry.type) {
     return ::testing::AssertionFailure()
            << "Actual event: " << NetLog::EventTypeToString(entry.type)
            << ". Expected event: " << NetLog::EventTypeToString(expected_event)
            << ".";
   }
   if (expected_phase != entry.phase) {
     return ::testing::AssertionFailure()
            << "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() << ".";
     }
   }
   return ::testing::AssertionSuccess();
 }
 
 inline ::testing::AssertionResult LogContainsEventAtTime(
-    const TestNetLog::CapturedEntryList& log,
+    const CapturedNetLogEntry::List& log,
     int i,  // Negative indices are reverse indices.
     const base::TimeTicks& expected_time,
     NetLog::EventType expected_event,
     NetLog::EventPhase expected_phase) {
   return LogContainsEventHelper(log, i, expected_time, true, expected_event,
                                 expected_phase);
 }
 
 // Version without timestamp.
 inline ::testing::AssertionResult LogContainsEvent(
-    const TestNetLog::CapturedEntryList& log,
+    const CapturedNetLogEntry::List& log,
     int i,  // Negative indices are reverse indices.
     NetLog::EventType expected_event,
     NetLog::EventPhase expected_phase) {
   return LogContainsEventHelper(log, i, base::TimeTicks(), false,
                                 expected_event, expected_phase);
 }
 
 // Version for PHASE_BEGIN (and no timestamp).
 inline ::testing::AssertionResult LogContainsBeginEvent(
-    const TestNetLog::CapturedEntryList& log,
+    const CapturedNetLogEntry::List& log,
     int i,  // Negative indices are reverse indices.
     NetLog::EventType expected_event) {
   return LogContainsEvent(log, i, expected_event, NetLog::PHASE_BEGIN);
 }
 
 // Version for PHASE_END (and no timestamp).
 inline ::testing::AssertionResult LogContainsEndEvent(
-    const TestNetLog::CapturedEntryList& log,
+    const CapturedNetLogEntry::List& 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 TestNetLog::CapturedEntryList& entries,
+    const CapturedNetLogEntry::List& entries,
     int i,  // Negative indices are reverse indices.
     NetLog::EventType type) {
   // Negative indices are reverse indices.
   size_t j = (i < 0) ? static_cast<size_t>(static_cast<int>(entries.size()) + i)
                      : static_cast<size_t>(i);
   if (j >= entries.size())
     return ::testing::AssertionFailure() << j << " is out of bounds.";
-  const TestNetLog::CapturedEntry& entry = entries[j];
+  const CapturedNetLogEntry& entry = entries[j];
   if (entry.type != type)
     return ::testing::AssertionFailure() << "Type does not match.";
   return ::testing::AssertionSuccess();
 }
 
 // Check if the log contains any entry of the given type at |min_index| or
 // after.
 inline ::testing::AssertionResult LogContainsEntryWithTypeAfter(
-    const TestNetLog::CapturedEntryList& entries,
+    const CapturedNetLogEntry::List& entries,
     int min_index,  // Negative indices are reverse indices.
     NetLog::EventType type) {
   // Negative indices are reverse indices.
   size_t real_index =
       (min_index < 0)
           ? static_cast<size_t>(static_cast<int>(entries.size()) + min_index)
           : static_cast<size_t>(min_index);
   for (size_t i = real_index; i < entries.size(); ++i) {
-    const TestNetLog::CapturedEntry& entry = entries[i];
+    const CapturedNetLogEntry& entry = entries[i];
     if (entry.type == type)
       return ::testing::AssertionSuccess();
   }
   return ::testing::AssertionFailure();
 }
 
 // Expect that the log contains an event, but don't care about where
 // as long as the first index where it is found is at least |min_index|.
 // Returns the position where the event was found.
 inline size_t ExpectLogContainsSomewhere(
-    const TestNetLog::CapturedEntryList& entries,
+    const CapturedNetLogEntry::List& entries,
     size_t min_index,
     NetLog::EventType expected_event,
     NetLog::EventPhase expected_phase) {
   size_t i = 0;
   for (; i < entries.size(); ++i) {
-    const TestNetLog::CapturedEntry& entry = entries[i];
+    const CapturedNetLogEntry& 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;
 }
 
 // Expect that the log contains an event, but don't care about where
 // as long as one index where it is found is at least |min_index|.
 // Returns the first such position where the event was found.
 inline size_t ExpectLogContainsSomewhereAfter(
-    const TestNetLog::CapturedEntryList& entries,
+    const CapturedNetLogEntry::List& entries,
     size_t min_index,
     NetLog::EventType expected_event,
     NetLog::EventPhase expected_phase) {
   size_t i = min_index;
   for (; i < entries.size(); ++i) {
-    const TestNetLog::CapturedEntry& entry = entries[i];
+    const CapturedNetLogEntry& entry = entries[i];
     if (entry.type == expected_event && entry.phase == expected_phase)
       break;
   }
   EXPECT_LT(i, entries.size());
   return i;
 }
 
 }  // namespace net
 
 #endif  // NET_LOG_NET_LOG_UNITTEST_H_