summaryrefslogtreecommitdiffstats
path: root/net/proxy
diff options
context:
space:
mode:
Diffstat (limited to 'net/proxy')
-rw-r--r--net/proxy/multi_threaded_proxy_resolver_unittest.cc16
-rw-r--r--net/proxy/proxy_resolver_v8_tracing_unittest.cc70
-rw-r--r--net/proxy/proxy_resolver_v8_unittest.cc4
-rw-r--r--net/proxy/proxy_script_decider_unittest.cc20
-rw-r--r--net/proxy/proxy_service_unittest.cc24
5 files changed, 67 insertions, 67 deletions
diff --git a/net/proxy/multi_threaded_proxy_resolver_unittest.cc b/net/proxy/multi_threaded_proxy_resolver_unittest.cc
index 9d8d728..eb70c1df 100644
--- a/net/proxy/multi_threaded_proxy_resolver_unittest.cc
+++ b/net/proxy/multi_threaded_proxy_resolver_unittest.cc
@@ -194,7 +194,7 @@ TEST(MultiThreadedProxyResolverTest, SingleThread_Basic) {
// Start request 0.
TestCompletionCallback callback0;
- CapturingBoundNetLog log0;
+ BoundTestNetLog log0;
ProxyInfo results0;
rv = resolver.GetProxyForURL(GURL("http://request0"), &results0,
callback0.callback(), NULL, log0.bound());
@@ -209,7 +209,7 @@ TEST(MultiThreadedProxyResolverTest, SingleThread_Basic) {
// on completion, this should have been copied into |log0|.
// We also have 1 log entry that was emitted by the
// MultiThreadedProxyResolver.
- CapturingNetLog::CapturedEntryList entries0;
+ TestNetLog::CapturedEntryList entries0;
log0.GetEntries(&entries0);
ASSERT_EQ(2u, entries0.size());
@@ -275,7 +275,7 @@ TEST(MultiThreadedProxyResolverTest,
ProxyResolver::RequestHandle request0;
TestCompletionCallback callback0;
ProxyInfo results0;
- CapturingBoundNetLog log0;
+ BoundTestNetLog log0;
rv = resolver.GetProxyForURL(GURL("http://request0"), &results0,
callback0.callback(), &request0, log0.bound());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -284,7 +284,7 @@ TEST(MultiThreadedProxyResolverTest,
TestCompletionCallback callback1;
ProxyInfo results1;
- CapturingBoundNetLog log1;
+ BoundTestNetLog log1;
rv = resolver.GetProxyForURL(GURL("http://request1"), &results1,
callback1.callback(), NULL, log1.bound());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -292,7 +292,7 @@ TEST(MultiThreadedProxyResolverTest,
ProxyResolver::RequestHandle request2;
TestCompletionCallback callback2;
ProxyInfo results2;
- CapturingBoundNetLog log2;
+ BoundTestNetLog log2;
rv = resolver.GetProxyForURL(GURL("http://request2"), &results2,
callback2.callback(), &request2, log2.bound());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -307,7 +307,7 @@ TEST(MultiThreadedProxyResolverTest,
EXPECT_EQ(0, callback0.WaitForResult());
EXPECT_EQ("PROXY request0:80", results0.ToPacString());
- CapturingNetLog::CapturedEntryList entries0;
+ TestNetLog::CapturedEntryList entries0;
log0.GetEntries(&entries0);
ASSERT_EQ(2u, entries0.size());
@@ -318,7 +318,7 @@ TEST(MultiThreadedProxyResolverTest,
EXPECT_EQ(1, callback1.WaitForResult());
EXPECT_EQ("PROXY request1:80", results1.ToPacString());
- CapturingNetLog::CapturedEntryList entries1;
+ TestNetLog::CapturedEntryList entries1;
log1.GetEntries(&entries1);
ASSERT_EQ(4u, entries1.size());
@@ -333,7 +333,7 @@ TEST(MultiThreadedProxyResolverTest,
EXPECT_EQ(2, callback2.WaitForResult());
EXPECT_EQ("PROXY request2:80", results2.ToPacString());
- CapturingNetLog::CapturedEntryList entries2;
+ TestNetLog::CapturedEntryList entries2;
log2.GetEntries(&entries2);
ASSERT_EQ(4u, entries2.size());
diff --git a/net/proxy/proxy_resolver_v8_tracing_unittest.cc b/net/proxy/proxy_resolver_v8_tracing_unittest.cc
index 9c25508..13dfe62 100644
--- a/net/proxy/proxy_resolver_v8_tracing_unittest.cc
+++ b/net/proxy/proxy_resolver_v8_tracing_unittest.cc
@@ -96,8 +96,8 @@ class MockErrorObserver : public ProxyResolverErrorObserver {
};
TEST_F(ProxyResolverV8TracingTest, Simple) {
- CapturingNetLog log;
- CapturingBoundNetLog request_log;
+ TestNetLog log;
+ BoundTestNetLog request_log;
MockCachingHostResolver host_resolver;
MockErrorObserver* error_observer = new MockErrorObserver;
ProxyResolverV8Tracing resolver(&host_resolver, error_observer, &log);
@@ -127,8 +127,8 @@ TEST_F(ProxyResolverV8TracingTest, Simple) {
}
TEST_F(ProxyResolverV8TracingTest, JavascriptError) {
- CapturingNetLog log;
- CapturingBoundNetLog request_log;
+ TestNetLog log;
+ BoundTestNetLog request_log;
MockCachingHostResolver host_resolver;
MockErrorObserver* error_observer = new MockErrorObserver;
ProxyResolverV8Tracing resolver(&host_resolver, error_observer, &log);
@@ -152,12 +152,12 @@ TEST_F(ProxyResolverV8TracingTest, JavascriptError) {
// Check the NetLogs -- there was 1 alert and 1 javascript error, and they
// were output to both the global log, and per-request log.
- CapturingNetLog::CapturedEntryList entries_list[2];
+ TestNetLog::CapturedEntryList entries_list[2];
log.GetEntries(&entries_list[0]);
request_log.GetEntries(&entries_list[1]);
for (size_t list_i = 0; list_i < arraysize(entries_list); list_i++) {
- const CapturingNetLog::CapturedEntryList& entries = entries_list[list_i];
+ const TestNetLog::CapturedEntryList& entries = entries_list[list_i];
EXPECT_EQ(2u, entries.size());
EXPECT_TRUE(
LogContainsEvent(entries, 0, NetLog::TYPE_PAC_JAVASCRIPT_ALERT,
@@ -173,8 +173,8 @@ TEST_F(ProxyResolverV8TracingTest, JavascriptError) {
}
TEST_F(ProxyResolverV8TracingTest, TooManyAlerts) {
- CapturingNetLog log;
- CapturingBoundNetLog request_log;
+ TestNetLog log;
+ BoundTestNetLog request_log;
MockCachingHostResolver host_resolver;
MockErrorObserver* error_observer = new MockErrorObserver;
ProxyResolverV8Tracing resolver(&host_resolver, error_observer, &log);
@@ -206,12 +206,12 @@ TEST_F(ProxyResolverV8TracingTest, TooManyAlerts) {
// Check the NetLogs -- the script generated 50 alerts, which were mirrored
// to both the global and per-request logs.
- CapturingNetLog::CapturedEntryList entries_list[2];
+ TestNetLog::CapturedEntryList entries_list[2];
log.GetEntries(&entries_list[0]);
request_log.GetEntries(&entries_list[1]);
for (size_t list_i = 0; list_i < arraysize(entries_list); list_i++) {
- const CapturingNetLog::CapturedEntryList& entries = entries_list[list_i];
+ const TestNetLog::CapturedEntryList& entries = entries_list[list_i];
EXPECT_EQ(50u, entries.size());
for (size_t i = 0; i < entries.size(); ++i) {
ASSERT_TRUE(
@@ -224,8 +224,8 @@ TEST_F(ProxyResolverV8TracingTest, TooManyAlerts) {
// Verify that buffered alerts cannot grow unboundedly, even when the message is
// empty string.
TEST_F(ProxyResolverV8TracingTest, TooManyEmptyAlerts) {
- CapturingNetLog log;
- CapturingBoundNetLog request_log;
+ TestNetLog log;
+ BoundTestNetLog request_log;
MockCachingHostResolver host_resolver;
MockErrorObserver* error_observer = new MockErrorObserver;
ProxyResolverV8Tracing resolver(&host_resolver, error_observer, &log);
@@ -254,12 +254,12 @@ TEST_F(ProxyResolverV8TracingTest, TooManyEmptyAlerts) {
// Check the NetLogs -- the script generated 50 alerts, which were mirrored
// to both the global and per-request logs.
- CapturingNetLog::CapturedEntryList entries_list[2];
+ TestNetLog::CapturedEntryList entries_list[2];
log.GetEntries(&entries_list[0]);
request_log.GetEntries(&entries_list[1]);
for (size_t list_i = 0; list_i < arraysize(entries_list); list_i++) {
- const CapturingNetLog::CapturedEntryList& entries = entries_list[list_i];
+ const TestNetLog::CapturedEntryList& entries = entries_list[list_i];
EXPECT_EQ(1000u, entries.size());
for (size_t i = 0; i < entries.size(); ++i) {
ASSERT_TRUE(
@@ -273,8 +273,8 @@ TEST_F(ProxyResolverV8TracingTest, TooManyEmptyAlerts) {
// verifies the final result, and that the underlying DNS resolver received
// the correct set of queries.
TEST_F(ProxyResolverV8TracingTest, Dns) {
- CapturingNetLog log;
- CapturingBoundNetLog request_log;
+ TestNetLog log;
+ BoundTestNetLog request_log;
MockCachingHostResolver host_resolver;
MockErrorObserver* error_observer = new MockErrorObserver;
ProxyResolverV8Tracing resolver(&host_resolver, error_observer, &log);
@@ -332,12 +332,12 @@ TEST_F(ProxyResolverV8TracingTest, Dns) {
// Check the NetLogs -- the script generated 1 alert, mirrored to both
// the per-request and global logs.
- CapturingNetLog::CapturedEntryList entries_list[2];
+ TestNetLog::CapturedEntryList entries_list[2];
log.GetEntries(&entries_list[0]);
request_log.GetEntries(&entries_list[1]);
for (size_t list_i = 0; list_i < arraysize(entries_list); list_i++) {
- const CapturingNetLog::CapturedEntryList& entries = entries_list[list_i];
+ const TestNetLog::CapturedEntryList& entries = entries_list[list_i];
EXPECT_EQ(1u, entries.size());
EXPECT_TRUE(
LogContainsEvent(entries, 0, NetLog::TYPE_PAC_JAVASCRIPT_ALERT,
@@ -350,8 +350,8 @@ TEST_F(ProxyResolverV8TracingTest, Dns) {
// "dnsResolve()". This requires 2 restarts. However once the HostResolver's
// cache is warmed, subsequent calls should take 0 restarts.
TEST_F(ProxyResolverV8TracingTest, DnsChecksCache) {
- CapturingNetLog log;
- CapturingBoundNetLog request_log;
+ TestNetLog log;
+ BoundTestNetLog request_log;
MockCachingHostResolver host_resolver;
MockErrorObserver* error_observer = new MockErrorObserver;
ProxyResolverV8Tracing resolver(&host_resolver, error_observer, &log);
@@ -407,8 +407,8 @@ TEST_F(ProxyResolverV8TracingTest, DnsChecksCache) {
// optimization. The proxy resolver should detect the inconsistency and
// fall-back to synchronous mode execution.
TEST_F(ProxyResolverV8TracingTest, FallBackToSynchronous1) {
- CapturingNetLog log;
- CapturingBoundNetLog request_log;
+ TestNetLog log;
+ BoundTestNetLog request_log;
MockCachingHostResolver host_resolver;
MockErrorObserver* error_observer = new MockErrorObserver;
ProxyResolverV8Tracing resolver(&host_resolver, error_observer, &log);
@@ -441,12 +441,12 @@ TEST_F(ProxyResolverV8TracingTest, FallBackToSynchronous1) {
// Check the NetLogs -- the script generated 1 alert, mirrored to both
// the per-request and global logs.
- CapturingNetLog::CapturedEntryList entries_list[2];
+ TestNetLog::CapturedEntryList entries_list[2];
log.GetEntries(&entries_list[0]);
request_log.GetEntries(&entries_list[1]);
for (size_t list_i = 0; list_i < arraysize(entries_list); list_i++) {
- const CapturingNetLog::CapturedEntryList& entries = entries_list[list_i];
+ const TestNetLog::CapturedEntryList& entries = entries_list[list_i];
EXPECT_EQ(1u, entries.size());
EXPECT_TRUE(
LogContainsEvent(entries, 0, NetLog::TYPE_PAC_JAVASCRIPT_ALERT,
@@ -459,8 +459,8 @@ TEST_F(ProxyResolverV8TracingTest, FallBackToSynchronous1) {
// optimization. The proxy resolver should detect the inconsistency and
// fall-back to synchronous mode execution.
TEST_F(ProxyResolverV8TracingTest, FallBackToSynchronous2) {
- CapturingNetLog log;
- CapturingBoundNetLog request_log;
+ TestNetLog log;
+ BoundTestNetLog request_log;
MockCachingHostResolver host_resolver;
MockErrorObserver* error_observer = new MockErrorObserver;
ProxyResolverV8Tracing resolver(&host_resolver, error_observer, &log);
@@ -499,8 +499,8 @@ TEST_F(ProxyResolverV8TracingTest, FallBackToSynchronous2) {
// DNS resolves per request limit (20) after which every DNS resolve will
// fail.
TEST_F(ProxyResolverV8TracingTest, InfiniteDNSSequence) {
- CapturingNetLog log;
- CapturingBoundNetLog request_log;
+ TestNetLog log;
+ BoundTestNetLog request_log;
MockCachingHostResolver host_resolver;
MockErrorObserver* error_observer = new MockErrorObserver;
ProxyResolverV8Tracing resolver(&host_resolver, error_observer, &log);
@@ -542,8 +542,8 @@ TEST_F(ProxyResolverV8TracingTest, InfiniteDNSSequence) {
// DNS resolves per request limit (20) after which every DNS resolve will
// fail.
TEST_F(ProxyResolverV8TracingTest, InfiniteDNSSequence2) {
- CapturingNetLog log;
- CapturingBoundNetLog request_log;
+ TestNetLog log;
+ BoundTestNetLog request_log;
MockCachingHostResolver host_resolver;
MockErrorObserver* error_observer = new MockErrorObserver;
ProxyResolverV8Tracing resolver(&host_resolver, error_observer, &log);
@@ -575,8 +575,8 @@ TEST_F(ProxyResolverV8TracingTest, InfiniteDNSSequence2) {
}
void DnsDuringInitHelper(bool synchronous_host_resolver) {
- CapturingNetLog log;
- CapturingBoundNetLog request_log;
+ TestNetLog log;
+ BoundTestNetLog request_log;
MockCachingHostResolver host_resolver;
host_resolver.set_synchronous_mode(synchronous_host_resolver);
MockErrorObserver* error_observer = new MockErrorObserver;
@@ -614,7 +614,7 @@ void DnsDuringInitHelper(bool synchronous_host_resolver) {
// Check the NetLogs -- the script generated 2 alerts during initialization.
EXPECT_EQ(0u, request_log.GetSize());
- CapturingNetLog::CapturedEntryList entries;
+ TestNetLog::CapturedEntryList entries;
log.GetEntries(&entries);
ASSERT_EQ(2u, entries.size());
@@ -949,8 +949,8 @@ TEST_F(ProxyResolverV8TracingTest, CancelSetPacWhileOutstandingBlockingDns) {
// This tests that the execution of a PAC script is terminated when the DNS
// dependencies are missing. If the test fails, then it will hang.
TEST_F(ProxyResolverV8TracingTest, Terminate) {
- CapturingNetLog log;
- CapturingBoundNetLog request_log;
+ TestNetLog log;
+ BoundTestNetLog request_log;
MockCachingHostResolver host_resolver;
MockErrorObserver* error_observer = new MockErrorObserver;
ProxyResolverV8Tracing resolver(&host_resolver, error_observer, &log);
diff --git a/net/proxy/proxy_resolver_v8_unittest.cc b/net/proxy/proxy_resolver_v8_unittest.cc
index ae582dc..1f33e18 100644
--- a/net/proxy/proxy_resolver_v8_unittest.cc
+++ b/net/proxy/proxy_resolver_v8_unittest.cc
@@ -145,7 +145,7 @@ TEST(ProxyResolverV8Test, Direct) {
EXPECT_EQ(OK, result);
ProxyInfo proxy_info;
- CapturingBoundNetLog log;
+ BoundTestNetLog log;
result = resolver.GetProxyForURL(
kQueryUrl, &proxy_info, CompletionCallback(), NULL, log.bound());
@@ -155,7 +155,7 @@ TEST(ProxyResolverV8Test, Direct) {
EXPECT_EQ(0U, resolver.mock_js_bindings()->alerts.size());
EXPECT_EQ(0U, resolver.mock_js_bindings()->errors.size());
- net::CapturingNetLog::CapturedEntryList entries;
+ net::TestNetLog::CapturedEntryList entries;
log.GetEntries(&entries);
// No bindings were called, so no log entries.
EXPECT_EQ(0u, entries.size());
diff --git a/net/proxy/proxy_script_decider_unittest.cc b/net/proxy/proxy_script_decider_unittest.cc
index b30243d..383c159 100644
--- a/net/proxy/proxy_script_decider_unittest.cc
+++ b/net/proxy/proxy_script_decider_unittest.cc
@@ -188,14 +188,14 @@ TEST(ProxyScriptDeciderTest, CustomPacSucceeds) {
Rules::Rule rule = rules.AddSuccessRule("http://custom/proxy.pac");
TestCompletionCallback callback;
- CapturingNetLog log;
+ TestNetLog log;
ProxyScriptDecider decider(&fetcher, &dhcp_fetcher, &log);
EXPECT_EQ(OK, decider.Start(
config, base::TimeDelta(), true, callback.callback()));
EXPECT_EQ(rule.text(), decider.script_data()->utf16());
// Check the NetLog was filled correctly.
- CapturingNetLog::CapturedEntryList entries;
+ TestNetLog::CapturedEntryList entries;
log.GetEntries(&entries);
EXPECT_EQ(4u, entries.size());
@@ -224,7 +224,7 @@ TEST(ProxyScriptDeciderTest, CustomPacFails1) {
rules.AddFailDownloadRule("http://custom/proxy.pac");
TestCompletionCallback callback;
- CapturingNetLog log;
+ TestNetLog log;
ProxyScriptDecider decider(&fetcher, &dhcp_fetcher, &log);
EXPECT_EQ(kFailedDownloading,
decider.Start(config, base::TimeDelta(), true,
@@ -232,7 +232,7 @@ TEST(ProxyScriptDeciderTest, CustomPacFails1) {
EXPECT_EQ(NULL, decider.script_data());
// Check the NetLog was filled correctly.
- CapturingNetLog::CapturedEntryList entries;
+ TestNetLog::CapturedEntryList entries;
log.GetEntries(&entries);
EXPECT_EQ(4u, entries.size());
@@ -477,7 +477,7 @@ TEST(ProxyScriptDeciderTest, AutodetectFailCustomSuccess2) {
Rules::Rule rule = rules.AddSuccessRule("http://custom/proxy.pac");
TestCompletionCallback callback;
- CapturingNetLog log;
+ TestNetLog log;
ProxyScriptDecider decider(&fetcher, &dhcp_fetcher, &log);
EXPECT_EQ(OK, decider.Start(config, base::TimeDelta(),
@@ -492,7 +492,7 @@ TEST(ProxyScriptDeciderTest, AutodetectFailCustomSuccess2) {
// Check the NetLog was filled correctly.
// (Note that various states are repeated since both WPAD and custom
// PAC scripts are tried).
- CapturingNetLog::CapturedEntryList entries;
+ TestNetLog::CapturedEntryList entries;
log.GetEntries(&entries);
EXPECT_EQ(10u, entries.size());
@@ -582,7 +582,7 @@ TEST(ProxyScriptDeciderTest, CustomPacFails1_WithPositiveDelay) {
rules.AddFailDownloadRule("http://custom/proxy.pac");
TestCompletionCallback callback;
- CapturingNetLog log;
+ TestNetLog log;
ProxyScriptDecider decider(&fetcher, &dhcp_fetcher, &log);
EXPECT_EQ(ERR_IO_PENDING,
decider.Start(config, base::TimeDelta::FromMilliseconds(1),
@@ -592,7 +592,7 @@ TEST(ProxyScriptDeciderTest, CustomPacFails1_WithPositiveDelay) {
EXPECT_EQ(NULL, decider.script_data());
// Check the NetLog was filled correctly.
- CapturingNetLog::CapturedEntryList entries;
+ TestNetLog::CapturedEntryList entries;
log.GetEntries(&entries);
EXPECT_EQ(6u, entries.size());
@@ -624,7 +624,7 @@ TEST(ProxyScriptDeciderTest, CustomPacFails1_WithNegativeDelay) {
rules.AddFailDownloadRule("http://custom/proxy.pac");
TestCompletionCallback callback;
- CapturingNetLog log;
+ TestNetLog log;
ProxyScriptDecider decider(&fetcher, &dhcp_fetcher, &log);
EXPECT_EQ(kFailedDownloading,
decider.Start(config, base::TimeDelta::FromSeconds(-5),
@@ -632,7 +632,7 @@ TEST(ProxyScriptDeciderTest, CustomPacFails1_WithNegativeDelay) {
EXPECT_EQ(NULL, decider.script_data());
// Check the NetLog was filled correctly.
- CapturingNetLog::CapturedEntryList entries;
+ TestNetLog::CapturedEntryList entries;
log.GetEntries(&entries);
EXPECT_EQ(4u, entries.size());
diff --git a/net/proxy/proxy_service_unittest.cc b/net/proxy/proxy_service_unittest.cc
index a37f31f5..db4151d 100644
--- a/net/proxy/proxy_service_unittest.cc
+++ b/net/proxy/proxy_service_unittest.cc
@@ -249,7 +249,7 @@ TEST_F(ProxyServiceTest, Direct) {
ProxyInfo info;
TestCompletionCallback callback;
- CapturingBoundNetLog log;
+ BoundTestNetLog log;
int rv = service.ResolveProxy(
url, net::LOAD_NORMAL, &info, callback.callback(), NULL, NULL,
log.bound());
@@ -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());
@@ -287,7 +287,7 @@ TEST_F(ProxyServiceTest, OnResolveProxyCallbackAddProxy) {
ProxyInfo info;
TestCompletionCallback callback;
- CapturingBoundNetLog log;
+ BoundTestNetLog log;
// First, warm up the ProxyService.
int rv = service.ResolveProxy(
@@ -346,7 +346,7 @@ TEST_F(ProxyServiceTest, OnResolveProxyCallbackRemoveProxy) {
ProxyInfo info;
TestCompletionCallback callback;
- CapturingBoundNetLog log;
+ BoundTestNetLog log;
// First, warm up the ProxyService.
int rv = service.ResolveProxy(
@@ -393,7 +393,7 @@ TEST_F(ProxyServiceTest, PAC) {
ProxyInfo info;
TestCompletionCallback callback;
ProxyService::PacRequest* request;
- CapturingBoundNetLog log;
+ BoundTestNetLog log;
int rv = service.ResolveProxy(
url, net::LOAD_NORMAL, &info, callback.callback(), &request, NULL,
@@ -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());
@@ -1913,7 +1913,7 @@ TEST_F(ProxyServiceTest, CancelWhilePACFetching) {
ProxyInfo info1;
TestCompletionCallback callback1;
ProxyService::PacRequest* request1;
- CapturingBoundNetLog log1;
+ BoundTestNetLog log1;
int rv = service.ResolveProxy(GURL("http://request1"), net::LOAD_NORMAL,
&info1, callback1.callback(), &request1, NULL,
log1.bound());
@@ -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,
@@ -3131,7 +3131,7 @@ TEST_F(ProxyServiceTest, SynchronousWithPAC) {
ProxyInfo info;
info.UseDirect();
- CapturingBoundNetLog log;
+ BoundTestNetLog log;
bool synchronous_success = service.TryResolveProxySynchronously(
url, net::LOAD_NORMAL, &info, NULL, log.bound());
@@ -3160,7 +3160,7 @@ TEST_F(ProxyServiceTest, SynchronousWithFixedConfiguration) {
GURL url("http://www.google.com/");
ProxyInfo info;
- CapturingBoundNetLog log;
+ BoundTestNetLog log;
bool synchronous_success = service.TryResolveProxySynchronously(
url, net::LOAD_NORMAL, &info, NULL, log.bound());
generated by cgit v1.1 at 2025-05-20 03:24:02 +0000