diff options
Diffstat (limited to 'net/proxy')
| -rw-r--r-- | net/proxy/init_proxy_resolver_unittest.cc | 6 | ||||
| -rw-r--r-- | net/proxy/proxy_resolver_v8_unittest.cc | 4 | ||||
| -rw-r--r-- | net/proxy/proxy_service_unittest.cc | 6 | ||||
| -rw-r--r-- | net/proxy/single_threaded_proxy_resolver_unittest.cc | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/net/proxy/init_proxy_resolver_unittest.cc b/net/proxy/init_proxy_resolver_unittest.cc index 4e0b881..45fcc39 100644 --- a/net/proxy/init_proxy_resolver_unittest.cc +++ b/net/proxy/init_proxy_resolver_unittest.cc @@ -177,7 +177,7 @@ TEST(InitProxyResolverTest, CustomPacSucceeds) { EXPECT_EQ(rule.bytes(), resolver.pac_bytes()); // Check the LoadLog was filled correctly. - EXPECT_EQ(6u, log->events().size()); + EXPECT_EQ(6u, log->entries().size()); ExpectLogContains(log, 0, LoadLog::TYPE_INIT_PROXY_RESOLVER, LoadLog::PHASE_BEGIN); ExpectLogContains(log, 1, LoadLog::TYPE_INIT_PROXY_RESOLVER_FETCH_PAC_SCRIPT, @@ -210,7 +210,7 @@ TEST(InitProxyResolverTest, CustomPacFails1) { EXPECT_EQ("", resolver.pac_bytes()); // Check the LoadLog was filled correctly. - EXPECT_EQ(4u, log->events().size()); + EXPECT_EQ(4u, log->entries().size()); ExpectLogContains(log, 0, LoadLog::TYPE_INIT_PROXY_RESOLVER, LoadLog::PHASE_BEGIN); ExpectLogContains(log, 1, LoadLog::TYPE_INIT_PROXY_RESOLVER_FETCH_PAC_SCRIPT, @@ -310,7 +310,7 @@ TEST(InitProxyResolverTest, AutodetectFailCustomSuccess2) { // Check the LoadLog was filled correctly. // (Note that the Fetch and Set states are repeated since both WPAD and custom // PAC scripts are tried). - EXPECT_EQ(10u, log->events().size()); + EXPECT_EQ(10u, log->entries().size()); ExpectLogContains(log, 0, LoadLog::TYPE_INIT_PROXY_RESOLVER, LoadLog::PHASE_BEGIN); ExpectLogContains(log, 1, LoadLog::TYPE_INIT_PROXY_RESOLVER_FETCH_PAC_SCRIPT, diff --git a/net/proxy/proxy_resolver_v8_unittest.cc b/net/proxy/proxy_resolver_v8_unittest.cc index 54830bf..4d1c1b8 100644 --- a/net/proxy/proxy_resolver_v8_unittest.cc +++ b/net/proxy/proxy_resolver_v8_unittest.cc @@ -128,7 +128,7 @@ TEST(ProxyResolverV8Test, Direct) { EXPECT_EQ(0U, resolver.mock_js_bindings()->errors.size()); // No bindings were called, so no log entries. - EXPECT_EQ(0u, log->events().size()); + EXPECT_EQ(0u, log->entries().size()); } TEST(ProxyResolverV8Test, ReturnEmptyString) { @@ -434,7 +434,7 @@ TEST(ProxyResolverV8Test, LoadLog) { // in the LoadLog. This is because it gets called indirectly by // isInNet() and isResolvable(). - EXPECT_EQ(6u, log->events().size()); + EXPECT_EQ(6u, log->entries().size()); ExpectLogContains(log, 0, LoadLog::TYPE_PROXY_RESOLVER_V8_MY_IP_ADDRESS, LoadLog::PHASE_BEGIN); ExpectLogContains(log, 1, LoadLog::TYPE_PROXY_RESOLVER_V8_MY_IP_ADDRESS, diff --git a/net/proxy/proxy_service_unittest.cc b/net/proxy/proxy_service_unittest.cc index 3422b5a..6308cc5 100644 --- a/net/proxy/proxy_service_unittest.cc +++ b/net/proxy/proxy_service_unittest.cc @@ -106,7 +106,7 @@ TEST(ProxyServiceTest, Direct) { EXPECT_TRUE(info.is_direct()); // Check the LoadLog was filled correctly. - EXPECT_EQ(4u, log->events().size()); + EXPECT_EQ(4u, log->entries().size()); ExpectLogContains(log, 0, LoadLog::TYPE_PROXY_SERVICE, LoadLog::PHASE_BEGIN); ExpectLogContains(log, 3, LoadLog::TYPE_PROXY_SERVICE, LoadLog::PHASE_END); } @@ -145,7 +145,7 @@ TEST(ProxyServiceTest, PAC) { EXPECT_EQ("foopy:80", info.proxy_server().ToURI()); // Check the LoadLog was filled correctly. - EXPECT_EQ(6u, log->events().size()); + EXPECT_EQ(6u, log->entries().size()); ExpectLogContains(log, 0, LoadLog::TYPE_PROXY_SERVICE, LoadLog::PHASE_BEGIN); ExpectLogContains(log, 3, LoadLog::TYPE_PROXY_SERVICE_WAITING_FOR_INIT_PAC, LoadLog::PHASE_BEGIN); @@ -1134,7 +1134,7 @@ TEST(ProxyServiceTest, CancelWhilePACFetching) { EXPECT_FALSE(callback2.have_result()); // Cancelled. // Check the LoadLog for request 1 (which was cancelled) got filled properly. - EXPECT_EQ(6u, log1->events().size()); + EXPECT_EQ(6u, log1->entries().size()); ExpectLogContains(log1, 0, LoadLog::TYPE_PROXY_SERVICE, LoadLog::PHASE_BEGIN); ExpectLogContains(log1, 3, LoadLog::TYPE_PROXY_SERVICE_WAITING_FOR_INIT_PAC, LoadLog::PHASE_BEGIN); diff --git a/net/proxy/single_threaded_proxy_resolver_unittest.cc b/net/proxy/single_threaded_proxy_resolver_unittest.cc index 72cd8ee..46c768e 100644 --- a/net/proxy/single_threaded_proxy_resolver_unittest.cc +++ b/net/proxy/single_threaded_proxy_resolver_unittest.cc @@ -168,7 +168,7 @@ TEST(SingleThreadedProxyResolverTest, Basic) { // The mock proxy resolver should have written 1 log entry. And // on completion, this should have been copied into |log0|. - EXPECT_EQ(1u, log0->events().size()); + EXPECT_EQ(1u, log0->entries().size()); // Start 3 more requests (request1 to request3). |