| Index: net/log/trace_net_log_observer_unittest.cc
|
| diff --git a/net/log/trace_net_log_observer_unittest.cc b/net/log/trace_net_log_observer_unittest.cc
|
| index 2c2bb487f2c0587cf6fd6f76131b8435c836ce4f..10d249f1edf6229a40f0ecc62b58853eaf4a71a4 100644
|
| --- a/net/log/trace_net_log_observer_unittest.cc
|
| +++ b/net/log/trace_net_log_observer_unittest.cc
|
| @@ -17,6 +17,7 @@
|
| #include "base/trace_event/trace_event.h"
|
| #include "base/trace_event/trace_event_impl.h"
|
| #include "base/values.h"
|
| +#include "net/log/captured_net_log_entry.h"
|
| #include "net/log/net_log.h"
|
| #include "net/log/test_net_log.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| @@ -156,7 +157,7 @@ TEST_F(TraceNetLogObserverTest, TracingNotEnabled) {
|
| }
|
|
|
| TEST_F(TraceNetLogObserverTest, TraceEventCaptured) {
|
| - TestNetLog::CapturedEntryList entries;
|
| + CapturedNetLogEntry::List entries;
|
| net_log()->GetEntries(&entries);
|
| EXPECT_TRUE(entries.empty());
|
|
|
| @@ -223,7 +224,7 @@ TEST_F(TraceNetLogObserverTest, EnableAndDisableTracing) {
|
| EndTraceAndFlush();
|
| trace_net_log_observer()->StopWatchForTraceStart();
|
|
|
| - TestNetLog::CapturedEntryList entries;
|
| + CapturedNetLogEntry::List entries;
|
| net_log()->GetEntries(&entries);
|
| EXPECT_EQ(3u, entries.size());
|
| EXPECT_EQ(2u, trace_events()->GetSize());
|
| @@ -263,7 +264,7 @@ TEST_F(TraceNetLogObserverTest, DestroyObserverWhileTracing) {
|
|
|
| EndTraceAndFlush();
|
|
|
| - TestNetLog::CapturedEntryList entries;
|
| + CapturedNetLogEntry::List entries;
|
| net_log()->GetEntries(&entries);
|
| EXPECT_EQ(2u, entries.size());
|
| EXPECT_EQ(1u, trace_events()->GetSize());
|
| @@ -292,7 +293,7 @@ TEST_F(TraceNetLogObserverTest, DestroyObserverWhileNotTracing) {
|
|
|
| EndTraceAndFlush();
|
|
|
| - TestNetLog::CapturedEntryList entries;
|
| + CapturedNetLogEntry::List entries;
|
| net_log()->GetEntries(&entries);
|
| EXPECT_EQ(3u, entries.size());
|
| EXPECT_EQ(0u, trace_events()->GetSize());
|
| @@ -310,7 +311,7 @@ TEST_F(TraceNetLogObserverTest, CreateObserverAfterTracingStarts) {
|
|
|
| EndTraceAndFlush();
|
|
|
| - TestNetLog::CapturedEntryList entries;
|
| + CapturedNetLogEntry::List entries;
|
| net_log()->GetEntries(&entries);
|
| EXPECT_EQ(3u, entries.size());
|
| EXPECT_EQ(0u, trace_events()->GetSize());
|
| @@ -329,7 +330,7 @@ TEST_F(TraceNetLogObserverTest, EventsWithAndWithoutParameters) {
|
| EndTraceAndFlush();
|
| trace_net_log_observer()->StopWatchForTraceStart();
|
|
|
| - TestNetLog::CapturedEntryList entries;
|
| + CapturedNetLogEntry::List entries;
|
| net_log()->GetEntries(&entries);
|
| EXPECT_EQ(2u, entries.size());
|
| EXPECT_EQ(2u, trace_events()->GetSize());
|
|
|