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

net/log/test_net_log.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_TEST_NET_LOG_H_
 #define NET_LOG_TEST_NET_LOG_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "net/log/captured_net_log_entry.h"
 #include "net/log/capturing_net_log_observer.h"
 #include "net/log/net_log.h"
 
 namespace net {
 
 // TestNetLog is convenience class which combines a NetLog and a
 // CapturingNetLogObserver.  It is intended for testing only, and is part of the
 // net_test_support project.
 class TestNetLog : public NetLog {
  public:
-  // TODO(mmenke):  Get rid of these.
-  typedef CapturedNetLogEntry CapturedEntry;
-  typedef CapturedNetLogEntry::List CapturedEntryList;
-
   TestNetLog();
   ~TestNetLog() override;
 
   void SetCaptureMode(NetLogCaptureMode capture_mode);
 
   // Below methods are forwarded to capturing_net_log_observer_.
-  void GetEntries(CapturedEntryList* entry_list) const;
-  void GetEntriesForSource(Source source, CapturedEntryList* entry_list) const;
+  void GetEntries(CapturedNetLogEntry::List* entry_list) const;
+  void GetEntriesForSource(Source source,
+                           CapturedNetLogEntry::List* entry_list) const;
   size_t GetSize() const;
   void Clear();
 
  private:
   CapturingNetLogObserver capturing_net_log_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(TestNetLog);
 };
 
 // Helper class that exposes a similar API as BoundNetLog, but uses a
 // TestNetLog rather than the more generic NetLog.
 //
 // A BoundTestNetLog can easily be converted to a BoundNetLog using the
 // bound() method.
 class BoundTestNetLog {
  public:
   BoundTestNetLog();
   ~BoundTestNetLog();
 
   // The returned BoundNetLog is only valid while |this| is alive.
   BoundNetLog bound() const { return net_log_; }
 
   // Fills |entry_list| with all entries in the log.
-  void GetEntries(TestNetLog::CapturedEntryList* entry_list) const;
+  void GetEntries(CapturedNetLogEntry::List* entry_list) const;
 
   // Fills |entry_list| with all entries in the log from the specified Source.
   void GetEntriesForSource(NetLog::Source source,
-                           TestNetLog::CapturedEntryList* entry_list) const;
+                           CapturedNetLogEntry::List* entry_list) const;
 
   // Returns number of entries in the log.
   size_t GetSize() const;
 
   void Clear();
 
   // Sets the capture mode of the underlying TestNetLog.
   void SetCaptureMode(NetLogCaptureMode capture_mode);
 
  private:
   TestNetLog capturing_net_log_;
   const BoundNetLog net_log_;
 
   DISALLOW_COPY_AND_ASSIGN(BoundTestNetLog);
 };
 
 }  // namespace net
 
 #endif  // NET_LOG_TEST_NET_LOG_H_