summaryrefslogtreecommitdiffstats
path: root/net/proxy/init_proxy_resolver_unittest.cc
diff options
context:
space:
mode:
authoreroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-21 20:45:10 +0000
committereroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-21 20:45:10 +0000
commitbf6c087a98c4f6ce40f233dbf20f23b4722315da (patch)
tree790f8c75b69027f6b4c59e7ab421e371697b1a6b /net/proxy/init_proxy_resolver_unittest.cc
parent37ee9fd744eaa36d4458e6f8029812e6d891ad1b (diff)
downloadchromium_src-bf6c087a98c4f6ce40f233dbf20f23b4722315da.zip
chromium_src-bf6c087a98c4f6ce40f233dbf20f23b4722315da.tar.gz
chromium_src-bf6c087a98c4f6ce40f233dbf20f23b4722315da.tar.bz2
Extend LoadLog to support logging of arbitrary strings, and of network error codes.
- The logging of error codes is intended to be used in passive mode. - The logging of string messages is intended to be used when in full-logging mode. - The logging of string literal messages is intended to be used in passive mode. BUG=27552 Review URL: http://codereview.chromium.org/503066 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35103 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy/init_proxy_resolver_unittest.cc')
-rw-r--r--net/proxy/init_proxy_resolver_unittest.cc6
1 files changed, 3 insertions, 3 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,