[refactor] Remove TestNetLogEntry.
The callers can instead use NetLogEntry directly.
Change-Id: I93f2b8885fffc065ce768f7cadf14cf44989f4d6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1706773
Commit-Queue: Eric Roman <[email protected]>
Reviewed-by: Robbie McElrath <[email protected]>
Reviewed-by: Scott Violet <[email protected]>
Reviewed-by: David Benjamin <[email protected]>
Cr-Commit-Position: refs/heads/master@{#678952}
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc
index 4fc57ee..9ebd699 100644
--- a/net/url_request/url_request_unittest.cc
+++ b/net/url_request/url_request_unittest.cc
@@ -94,7 +94,6 @@
#include "net/log/net_log_event_type.h"
#include "net/log/net_log_source.h"
#include "net/log/test_net_log.h"
-#include "net/log/test_net_log_entry.h"
#include "net/log/test_net_log_util.h"
#include "net/net_buildflags.h"
#include "net/proxy_resolution/proxy_resolution_service.h"
@@ -2915,8 +2914,7 @@
EXPECT_EQ(0, network_delegate.blocked_get_cookies_count());
EXPECT_EQ(0, network_delegate.blocked_set_cookie_count());
- TestNetLogEntry::List entries;
- net_log_.GetEntries(&entries);
+ auto entries = net_log_.GetEntries();
for (const auto& entry : entries) {
EXPECT_NE(entry.type,
NetLogEventType::COOKIE_GET_BLOCKED_BY_NETWORK_DELEGATE);
@@ -2940,8 +2938,7 @@
EXPECT_EQ(1, network_delegate.blocked_get_cookies_count());
EXPECT_EQ(0, network_delegate.blocked_set_cookie_count());
- TestNetLogEntry::List entries;
- net_log_.GetEntries(&entries);
+ auto entries = net_log_.GetEntries();
ExpectLogContainsSomewhereAfter(
entries, 0, NetLogEventType::COOKIE_GET_BLOCKED_BY_NETWORK_DELEGATE,
NetLogEventPhase::NONE);
@@ -2971,8 +2968,7 @@
EXPECT_EQ(0, network_delegate.blocked_get_cookies_count());
EXPECT_EQ(0, network_delegate.blocked_set_cookie_count());
- TestNetLogEntry::List entries;
- net_log_.GetEntries(&entries);
+ auto entries = net_log_.GetEntries();
for (const auto& entry : entries) {
EXPECT_NE(entry.type,
NetLogEventType::COOKIE_SET_BLOCKED_BY_NETWORK_DELEGATE);
@@ -2994,8 +2990,7 @@
EXPECT_EQ(0, network_delegate.blocked_get_cookies_count());
EXPECT_EQ(2, network_delegate.blocked_set_cookie_count());
- TestNetLogEntry::List entries;
- net_log_.GetEntries(&entries);
+ auto entries = net_log_.GetEntries();
ExpectLogContainsSomewhereAfter(
entries, 0, NetLogEventType::COOKIE_SET_BLOCKED_BY_NETWORK_DELEGATE,
NetLogEventPhase::NONE);
@@ -5702,7 +5697,7 @@
// 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 TestNetLogEntry::List& entries,
+ static size_t CheckDelegateInfo(const std::vector<NetLogEntry>& entries,
size_t log_position) {
// There should be 4 DELEGATE_INFO events: Two begins and two ends.
if (log_position + 3 >= entries.size()) {
@@ -5712,9 +5707,9 @@
std::string delegate_info;
EXPECT_EQ(NetLogEventType::DELEGATE_INFO, entries[log_position].type);
EXPECT_EQ(NetLogEventPhase::BEGIN, entries[log_position].phase);
- EXPECT_TRUE(entries[log_position].GetStringValue("delegate_blocked_by",
- &delegate_info));
- EXPECT_EQ(kFirstDelegateInfo, delegate_info);
+ EXPECT_EQ(
+ kFirstDelegateInfo,
+ GetStringValueFromParams(entries[log_position], "delegate_blocked_by"));
++log_position;
EXPECT_EQ(NetLogEventType::DELEGATE_INFO, entries[log_position].type);
@@ -5723,9 +5718,9 @@
++log_position;
EXPECT_EQ(NetLogEventType::DELEGATE_INFO, entries[log_position].type);
EXPECT_EQ(NetLogEventPhase::BEGIN, entries[log_position].phase);
- EXPECT_TRUE(entries[log_position].GetStringValue("delegate_blocked_by",
- &delegate_info));
- EXPECT_EQ(kSecondDelegateInfo, delegate_info);
+ EXPECT_EQ(
+ kSecondDelegateInfo,
+ GetStringValueFromParams(entries[log_position], "delegate_blocked_by"));
++log_position;
EXPECT_EQ(NetLogEventType::DELEGATE_INFO, entries[log_position].type);
@@ -5985,8 +5980,7 @@
EXPECT_EQ(OK, request_delegate.request_status());
}
- TestNetLogEntry::List entries;
- net_log_.GetEntries(&entries);
+ auto entries = net_log_.GetEntries();
size_t log_position = ExpectLogContainsSomewhereAfter(
entries, 0, NetLogEventType::DELEGATE_INFO, NetLogEventPhase::BEGIN);
@@ -6027,8 +6021,7 @@
EXPECT_EQ(1, network_delegate.destroyed_requests());
size_t log_position = 0;
- TestNetLogEntry::List entries;
- net_log_.GetEntries(&entries);
+ auto entries = net_log_.GetEntries();
static const NetLogEventType kExpectedEvents[] = {
NetLogEventType::NETWORK_DELEGATE_BEFORE_URL_REQUEST,
NetLogEventType::NETWORK_DELEGATE_BEFORE_START_TRANSACTION,
@@ -6082,8 +6075,7 @@
EXPECT_EQ(1, network_delegate.destroyed_requests());
size_t log_position = 0;
- TestNetLogEntry::List entries;
- net_log_.GetEntries(&entries);
+ auto entries = net_log_.GetEntries();
static const NetLogEventType kExpectedEvents[] = {
NetLogEventType::NETWORK_DELEGATE_BEFORE_URL_REQUEST,
NetLogEventType::NETWORK_DELEGATE_BEFORE_START_TRANSACTION,
@@ -6157,8 +6149,7 @@
EXPECT_EQ(1, network_delegate.destroyed_requests());
size_t log_position = 0;
- TestNetLogEntry::List entries;
- net_log_.GetEntries(&entries);
+ auto entries = net_log_.GetEntries();
static const NetLogEventType kExpectedEvents[] = {
NetLogEventType::NETWORK_DELEGATE_BEFORE_URL_REQUEST,
NetLogEventType::NETWORK_DELEGATE_BEFORE_START_TRANSACTION,
@@ -6217,8 +6208,7 @@
EXPECT_EQ(OK, request_delegate.request_status());
}
- TestNetLogEntry::List entries;
- net_log_.GetEntries(&entries);
+ auto entries = net_log_.GetEntries();
size_t log_position = 0;
@@ -6271,8 +6261,7 @@
EXPECT_EQ(OK, request_delegate.request_status());
}
- TestNetLogEntry::List entries;
- net_log_.GetEntries(&entries);
+ auto entries = net_log_.GetEntries();
// Delegate info should only have been logged in OnReceivedRedirect and
// OnResponseStarted.
@@ -6331,8 +6320,7 @@
base::RunLoop().RunUntilIdle();
}
- TestNetLogEntry::List entries;
- net_log.GetEntries(&entries);
+ auto entries = net_log.GetEntries();
// Delegate info is always logged in both OnReceivedRedirect and
// OnResponseStarted. In the CANCEL_ON_RECEIVED_REDIRECT, the
