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

net/log/trace_net_log_observer_unittest.cc

 // Copyright 2014 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 "net/log/trace_net_log_observer.h"
 
 #include <string>
 #include <vector>
 
 #include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #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"
 
 using base::trace_event::TraceLog;
 
 namespace net {
 
 namespace {
 
@@ skipping 119 matching lines @@
   trace_net_log_observer()->WatchForTraceStart(net_log());
   net_log()->AddGlobalEntry(NetLog::TYPE_REQUEST_ALIVE);
 
   EndTraceAndFlush();
   trace_net_log_observer()->StopWatchForTraceStart();
 
   EXPECT_EQ(0u, trace_events()->GetSize());
 }
 
 TEST_F(TraceNetLogObserverTest, TraceEventCaptured) {
-  TestNetLog::CapturedEntryList entries;
+  CapturedNetLogEntry::List entries;
   net_log()->GetEntries(&entries);
   EXPECT_TRUE(entries.empty());
 
   trace_net_log_observer()->WatchForTraceStart(net_log());
   EnableTraceLog();
   BoundNetLog bound_net_log =
       BoundNetLog::Make(net_log(), net::NetLog::SOURCE_NONE);
   net_log()->AddGlobalEntry(NetLog::TYPE_CANCELLED);
   bound_net_log.BeginEvent(NetLog::TYPE_URL_REQUEST_START_JOB);
   bound_net_log.EndEvent(NetLog::TYPE_REQUEST_ALIVE);
@@ skipping 46 matching lines @@
   EnableTraceLog();
   net_log()->AddGlobalEntry(NetLog::TYPE_CANCELLED);
   TraceLog::GetInstance()->SetDisabled();
   net_log()->AddGlobalEntry(NetLog::TYPE_REQUEST_ALIVE);
   EnableTraceLog();
   net_log()->AddGlobalEntry(NetLog::TYPE_URL_REQUEST_START_JOB);
 
   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());
   const base::DictionaryValue* item1 = NULL;
   ASSERT_TRUE(trace_events()->GetDictionary(0, &item1));
   const base::DictionaryValue* item2 = NULL;
   ASSERT_TRUE(trace_events()->GetDictionary(1, &item2));
 
   TraceEntryInfo actual_item1 = GetTraceEntryInfoFromValue(*item1);
   TraceEntryInfo actual_item2 = GetTraceEntryInfoFromValue(*item2);
@@ skipping 19 matching lines @@
 TEST_F(TraceNetLogObserverTest, DestroyObserverWhileTracing) {
   trace_net_log_observer()->WatchForTraceStart(net_log());
   EnableTraceLog();
   net_log()->AddGlobalEntry(NetLog::TYPE_CANCELLED);
   trace_net_log_observer()->StopWatchForTraceStart();
   set_trace_net_log_observer(NULL);
   net_log()->AddGlobalEntry(NetLog::TYPE_REQUEST_ALIVE);
 
   EndTraceAndFlush();
 
-  TestNetLog::CapturedEntryList entries;
+  CapturedNetLogEntry::List entries;
   net_log()->GetEntries(&entries);
   EXPECT_EQ(2u, entries.size());
   EXPECT_EQ(1u, trace_events()->GetSize());
 
   const base::DictionaryValue* item1 = NULL;
   ASSERT_TRUE(trace_events()->GetDictionary(0, &item1));
 
   TraceEntryInfo actual_item1 = GetTraceEntryInfoFromValue(*item1);
   EXPECT_EQ(kNetLogTracingCategory, actual_item1.category);
   EXPECT_EQ(base::StringPrintf("0x%d", entries[0].source.id), actual_item1.id);
   EXPECT_EQ(std::string(1, TRACE_EVENT_PHASE_NESTABLE_ASYNC_INSTANT),
             actual_item1.phase);
   EXPECT_EQ(NetLog::EventTypeToString(NetLog::TYPE_CANCELLED),
             actual_item1.name);
   EXPECT_EQ(NetLog::SourceTypeToString(entries[0].source.type),
             actual_item1.source_type);
 }
 
 TEST_F(TraceNetLogObserverTest, DestroyObserverWhileNotTracing) {
   trace_net_log_observer()->WatchForTraceStart(net_log());
   net_log()->AddGlobalEntry(NetLog::TYPE_CANCELLED);
   trace_net_log_observer()->StopWatchForTraceStart();
   set_trace_net_log_observer(NULL);
   net_log()->AddGlobalEntry(NetLog::TYPE_REQUEST_ALIVE);
   net_log()->AddGlobalEntry(NetLog::TYPE_URL_REQUEST_START_JOB);
 
   EndTraceAndFlush();
 
-  TestNetLog::CapturedEntryList entries;
+  CapturedNetLogEntry::List entries;
   net_log()->GetEntries(&entries);
   EXPECT_EQ(3u, entries.size());
   EXPECT_EQ(0u, trace_events()->GetSize());
 }
 
 TEST_F(TraceNetLogObserverTest, CreateObserverAfterTracingStarts) {
   set_trace_net_log_observer(NULL);
   EnableTraceLog();
   set_trace_net_log_observer(new TraceNetLogObserver());
   trace_net_log_observer()->WatchForTraceStart(net_log());
   net_log()->AddGlobalEntry(NetLog::TYPE_CANCELLED);
   trace_net_log_observer()->StopWatchForTraceStart();
   net_log()->AddGlobalEntry(NetLog::TYPE_REQUEST_ALIVE);
   net_log()->AddGlobalEntry(NetLog::TYPE_URL_REQUEST_START_JOB);
 
   EndTraceAndFlush();
 
-  TestNetLog::CapturedEntryList entries;
+  CapturedNetLogEntry::List entries;
   net_log()->GetEntries(&entries);
   EXPECT_EQ(3u, entries.size());
   EXPECT_EQ(0u, trace_events()->GetSize());
 }
 
 TEST_F(TraceNetLogObserverTest, EventsWithAndWithoutParameters) {
   trace_net_log_observer()->WatchForTraceStart(net_log());
   EnableTraceLog();
   NetLog::ParametersCallback net_log_callback;
   std::string param = "bar";
   net_log_callback = NetLog::StringCallback("foo", &param);
 
   net_log()->AddGlobalEntry(NetLog::TYPE_CANCELLED, net_log_callback);
   net_log()->AddGlobalEntry(NetLog::TYPE_REQUEST_ALIVE);
 
   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());
   const base::DictionaryValue* item1 = NULL;
   ASSERT_TRUE(trace_events()->GetDictionary(0, &item1));
   const base::DictionaryValue* item2 = NULL;
   ASSERT_TRUE(trace_events()->GetDictionary(1, &item2));
 
   TraceEntryInfo actual_item1 = GetTraceEntryInfoFromValue(*item1);
   TraceEntryInfo actual_item2 = GetTraceEntryInfoFromValue(*item2);
@@ skipping 20 matching lines @@
   EXPECT_TRUE(item1->GetString("args.params.foo", &item1_params));
   EXPECT_EQ("bar", item1_params);
 
   EXPECT_TRUE(item2->GetString("args.params", &item2_params));
   EXPECT_TRUE(item2_params.empty());
 }
 
 }  // namespace
 
 }  // namespace net