Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(651)

Unified Diff: net/proxy/proxy_service_unittest.cc

Issue 1084533002: Rename NetLogLogger and CapturingNetLog (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/proxy/proxy_service_unittest.cc
diff --git a/net/proxy/proxy_service_unittest.cc b/net/proxy/proxy_service_unittest.cc
index a37f31f5f0a3e0fb0234fd69b640622c1ac9e123..0142a9f01bd416ed22a5500657276de7c3bd740f 100644
--- a/net/proxy/proxy_service_unittest.cc
+++ b/net/proxy/proxy_service_unittest.cc
@@ -261,7 +261,7 @@ TEST_F(ProxyServiceTest, Direct) {
EXPECT_TRUE(info.proxy_resolve_end_time().is_null());
// Check the NetLog was filled correctly.
- CapturingNetLog::CapturedEntryList entries;
+ TestNetLog::CapturedEntryList entries;
log.GetEntries(&entries);
EXPECT_EQ(3u, entries.size());
@@ -423,7 +423,7 @@ TEST_F(ProxyServiceTest, PAC) {
EXPECT_LE(info.proxy_resolve_start_time(), info.proxy_resolve_end_time());
// Check the NetLog was filled correctly.
- CapturingNetLog::CapturedEntryList entries;
+ TestNetLog::CapturedEntryList entries;
log.GetEntries(&entries);
EXPECT_EQ(5u, entries.size());
@@ -1970,7 +1970,7 @@ TEST_F(ProxyServiceTest, CancelWhilePACFetching) {
EXPECT_FALSE(callback1.have_result()); // Cancelled.
EXPECT_FALSE(callback2.have_result()); // Cancelled.
- CapturingNetLog::CapturedEntryList entries1;
+ TestNetLog::CapturedEntryList entries1;
log1.GetEntries(&entries1);
// Check the NetLog for request 1 (which was cancelled) got filled properly.
@@ -2423,7 +2423,7 @@ TEST_F(ProxyServiceTest, NetworkChangeTriggersPacRefetch) {
MockAsyncProxyResolverExpectsBytes resolver;
- CapturingNetLog log;
+ TestNetLog log;
ProxyService service(
config_service,
@@ -2520,7 +2520,7 @@ TEST_F(ProxyServiceTest, NetworkChangeTriggersPacRefetch) {
// Check that the expected events were output to the log stream. In particular
// PROXY_CONFIG_CHANGED should have only been emitted once (for the initial
// setup), and NOT a second time when the IP address changed.
- CapturingNetLog::CapturedEntryList entries;
+ TestNetLog::CapturedEntryList entries;
log.GetEntries(&entries);
EXPECT_TRUE(LogContainsEntryWithType(entries, 0,

Powered by Google App Engine
This is Rietveld 408576698