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

net/url_request/url_request_unittest.cc

 // 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.
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shlobj.h>
 #endif
@@ skipping 40 matching lines @@
 #include "net/disk_cache/disk_cache.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/ftp/ftp_network_layer.h"
 #include "net/http/http_byte_range.h"
 #include "net/http/http_cache.h"
 #include "net/http/http_network_layer.h"
 #include "net/http/http_network_session.h"
 #include "net/http/http_request_headers.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_util.h"
+#include "net/log/captured_net_log_entry.h"
 #include "net/log/net_log.h"
 #include "net/log/net_log_unittest.h"
 #include "net/log/test_net_log.h"
 #include "net/proxy/proxy_service.h"
 #include "net/socket/ssl_client_socket.h"
 #include "net/ssl/ssl_cipher_suite_names.h"
 #include "net/ssl/ssl_connection_status_flags.h"
 #include "net/test/cert_test_util.h"
 #include "net/test/spawned_test_server/spawned_test_server.h"
 #include "net/url_request/data_protocol_handler.h"
@@ skipping 4085 matching lines @@
         expected_second_load_state,
         expected_third_load_state,
         callback);
     logger->Start();
   }
 
   // Checks that the log entries, starting with log_position, contain the
   // DELEGATE_INFO NetLog events that an AsyncDelegateLogger should have
   // recorded.  Returns the index of entry after the expected number of
   // events this logged, or entries.size() if there aren't enough entries.
-  static size_t CheckDelegateInfo(const TestNetLog::CapturedEntryList& entries,
+  static size_t CheckDelegateInfo(const CapturedNetLogEntry::List& entries,
                                   size_t log_position) {
     // There should be 4 DELEGATE_INFO events: Two begins and two ends.
     if (log_position + 3 >= entries.size()) {
       ADD_FAILURE() << "Not enough log entries";
       return entries.size();
     }
     std::string delegate_info;
     EXPECT_EQ(NetLog::TYPE_DELEGATE_INFO, entries[log_position].type);
     EXPECT_EQ(NetLog::PHASE_BEGIN, entries[log_position].phase);
     EXPECT_TRUE(entries[log_position].GetStringValue("delegate_info",
@@ skipping 14 matching lines @@
     ++log_position;
     EXPECT_EQ(NetLog::TYPE_DELEGATE_INFO, entries[log_position].type);
     EXPECT_EQ(NetLog::PHASE_END, entries[log_position].phase);
 
     return log_position + 1;
   }
 
   // Find delegate request begin and end messages for OnBeforeNetworkStart.
   // Returns the position of the end message.
   static size_t ExpectBeforeNetworkEvents(
-      const TestNetLog::CapturedEntryList& entries,
+      const CapturedNetLogEntry::List& entries,
       size_t log_position) {
     log_position =
         ExpectLogContainsSomewhereAfter(entries,
                                         log_position,
                                         NetLog::TYPE_URL_REQUEST_DELEGATE,
                                         NetLog::PHASE_BEGIN);
     EXPECT_EQ(NetLog::TYPE_URL_REQUEST_DELEGATE,
               entries[log_position + 1].type);
     EXPECT_EQ(NetLog::PHASE_END, entries[log_position + 1].phase);
     return log_position + 1;
@@ skipping 246 matching lines @@
         LOAD_STATE_WAITING_FOR_DELEGATE,
         LOAD_STATE_IDLE,
         base::Bind(&URLRequest::Start, base::Unretained(r.get())));
 
     base::RunLoop().Run();
 
     EXPECT_EQ(200, r->GetResponseCode());
     EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status());
   }
 
-  TestNetLog::CapturedEntryList entries;
+  CapturedNetLogEntry::List entries;
   net_log_.GetEntries(&entries);
   size_t log_position = ExpectLogContainsSomewhereAfter(
       entries,
       0,
       NetLog::TYPE_DELEGATE_INFO,
       NetLog::PHASE_BEGIN);
 
   log_position = AsyncDelegateLogger::CheckDelegateInfo(entries, log_position);
 
   // Nothing else should add any delegate info to the request.
@@ skipping 24 matching lines @@
     base::RunLoop().Run();
 
     EXPECT_EQ(200, r->GetResponseCode());
     EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status());
     EXPECT_EQ(1, network_delegate.created_requests());
     EXPECT_EQ(0, network_delegate.destroyed_requests());
   }
   EXPECT_EQ(1, network_delegate.destroyed_requests());
 
   size_t log_position = 0;
-  TestNetLog::CapturedEntryList entries;
+  CapturedNetLogEntry::List entries;
   net_log_.GetEntries(&entries);
   for (size_t i = 0; i < 3; ++i) {
     log_position = ExpectLogContainsSomewhereAfter(
         entries,
         log_position + 1,
         NetLog::TYPE_URL_REQUEST_DELEGATE,
         NetLog::PHASE_BEGIN);
 
     log_position = AsyncDelegateLogger::CheckDelegateInfo(entries,
                                                           log_position + 1);
@@ skipping 36 matching lines @@
     base::RunLoop().Run();
 
     EXPECT_EQ(200, r->GetResponseCode());
     EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status());
     EXPECT_EQ(2, network_delegate.created_requests());
     EXPECT_EQ(0, network_delegate.destroyed_requests());
   }
   EXPECT_EQ(1, network_delegate.destroyed_requests());
 
   size_t log_position = 0;
-  TestNetLog::CapturedEntryList entries;
+  CapturedNetLogEntry::List entries;
   net_log_.GetEntries(&entries);
   // The NetworkDelegate logged information in OnBeforeURLRequest,
   // OnBeforeSendHeaders, and OnHeadersReceived.
   for (size_t i = 0; i < 3; ++i) {
     log_position = ExpectLogContainsSomewhereAfter(
         entries,
         log_position + 1,
         NetLog::TYPE_URL_REQUEST_DELEGATE,
         NetLog::PHASE_BEGIN);
 
@@ skipping 61 matching lines @@
     base::RunLoop().Run();
 
     EXPECT_EQ(200, r->GetResponseCode());
     EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status());
     EXPECT_EQ(1, network_delegate.created_requests());
     EXPECT_EQ(0, network_delegate.destroyed_requests());
   }
   EXPECT_EQ(1, network_delegate.destroyed_requests());
 
   size_t log_position = 0;
-  TestNetLog::CapturedEntryList entries;
+  CapturedNetLogEntry::List entries;
   net_log_.GetEntries(&entries);
   // The NetworkDelegate should have logged information in OnBeforeURLRequest,
   // OnBeforeSendHeaders, OnHeadersReceived, OnAuthRequired, and then again in
   // OnBeforeURLRequest and OnBeforeSendHeaders.
   for (size_t i = 0; i < 6; ++i) {
     log_position = ExpectLogContainsSomewhereAfter(
         entries,
         log_position + 1,
         NetLog::TYPE_URL_REQUEST_DELEGATE,
         NetLog::PHASE_BEGIN);
@@ skipping 36 matching lines @@
         test_server_.GetURL("chunked?waitBetweenChunks=20"), DEFAULT_PRIORITY,
         &request_delegate));
     LoadStateWithParam load_state = r->GetLoadState();
     r->Start();
     base::RunLoop().Run();
 
     EXPECT_EQ(200, r->GetResponseCode());
     EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status());
   }
 
-  TestNetLog::CapturedEntryList entries;
+  CapturedNetLogEntry::List entries;
   net_log_.GetEntries(&entries);
 
   size_t log_position = 0;
 
   log_position = AsyncDelegateLogger::ExpectBeforeNetworkEvents(
       entries, log_position);
 
   // The delegate info should only have been logged on header complete.  Other
   // times it should silently be ignored.
   log_position =
@@ skipping 32 matching lines @@
         test_server_.GetURL("server-redirect?simple.html"), DEFAULT_PRIORITY,
         &request_delegate));
     LoadStateWithParam load_state = r->GetLoadState();
     r->Start();
     base::RunLoop().Run();
 
     EXPECT_EQ(200, r->GetResponseCode());
     EXPECT_EQ(URLRequestStatus::SUCCESS, r->status().status());
   }
 
-  TestNetLog::CapturedEntryList entries;
+  CapturedNetLogEntry::List entries;
   net_log_.GetEntries(&entries);
 
   // Delegate info should only have been logged in OnReceivedRedirect and
   // OnResponseStarted.
   size_t log_position = 0;
   for (int i = 0; i < 2; ++i) {
     if (i == 0) {
       log_position = AsyncDelegateLogger::ExpectBeforeNetworkEvents(
                          entries, log_position) + 1;
     }
@@ skipping 41 matching lines @@
     {
       scoped_ptr<URLRequest> r(context.CreateRequest(
           test_server_.GetURL("server-redirect?simple.html"), DEFAULT_PRIORITY,
           &request_delegate));
       LoadStateWithParam load_state = r->GetLoadState();
       r->Start();
       base::RunLoop().Run();
       EXPECT_EQ(URLRequestStatus::CANCELED, r->status().status());
     }
 
-    TestNetLog::CapturedEntryList entries;
+    CapturedNetLogEntry::List entries;
     net_log.GetEntries(&entries);
 
     // Delegate info is always logged in both OnReceivedRedirect and
     // OnResponseStarted.  In the CANCEL_ON_RECEIVED_REDIRECT, the
     // OnResponseStarted delegate call is after cancellation, but logging is
     // still currently supported in that call.
     size_t log_position = 0;
     for (int i = 0; i < 2; ++i) {
       if (i == 0) {
         log_position = AsyncDelegateLogger::ExpectBeforeNetworkEvents(
@@ skipping 2459 matching lines @@
   EXPECT_FALSE(r->ssl_info().connection_status &
                SSL_CONNECTION_VERSION_FALLBACK);
   int expected_version = SSL_CONNECTION_VERSION_TLS1_2;
   if (SSLClientSocket::GetMaxSupportedSSLVersion() <
       SSL_PROTOCOL_VERSION_TLS1_2) {
     expected_version = SSL_CONNECTION_VERSION_TLS1_1;
   }
   EXPECT_EQ(expected_version,
             SSLConnectionStatusToVersion(r->ssl_info().connection_status));
 
-  TestNetLog::CapturedEntryList entries;
+  CapturedNetLogEntry::List entries;
   net_log.GetEntries(&entries);
   ExpectLogContainsSomewhere(entries, 0, NetLog::TYPE_SSL_CIPHER_FALLBACK,
                              NetLog::PHASE_NONE);
 }
 
 // This tests that a load of www.google.com with a certificate error sets
 // the |certificate_errors_are_fatal| flag correctly. This flag will cause
 // the interstitial to be fatal.
 TEST_F(HTTPSRequestTest, HTTPSPreloadedHSTSTest) {
   SpawnedTestServer::SSLOptions ssl_options(
@@ skipping 1798 matching lines @@
 
     EXPECT_FALSE(r->is_pending());
     EXPECT_EQ(1, d->response_started_count());
     EXPECT_FALSE(d->received_data_before_response());
     EXPECT_EQ(d->bytes_received(), static_cast<int>(file_size));
   }
 }
 #endif  // !defined(DISABLE_FTP_SUPPORT)
 
 }  // namespace net