summaryrefslogtreecommitdiffstats
path: root/net/base/host_resolver_impl_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/base/host_resolver_impl_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/base/host_resolver_impl_unittest.cc')
-rw-r--r--net/base/host_resolver_impl_unittest.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/base/host_resolver_impl_unittest.cc b/net/base/host_resolver_impl_unittest.cc
index 5453d77..09436e3 100644
--- a/net/base/host_resolver_impl_unittest.cc
+++ b/net/base/host_resolver_impl_unittest.cc
@@ -192,7 +192,7 @@ TEST_F(HostResolverImplTest, SynchronousLookup) {
int err = host_resolver->Resolve(info, &adrlist, NULL, NULL, log);
EXPECT_EQ(OK, err);
- EXPECT_EQ(2u, log->events().size());
+ EXPECT_EQ(2u, log->entries().size());
ExpectLogContains(log, 0, LoadLog::TYPE_HOST_RESOLVER_IMPL,
LoadLog::PHASE_BEGIN);
ExpectLogContains(log, 1, LoadLog::TYPE_HOST_RESOLVER_IMPL,
@@ -224,7 +224,7 @@ TEST_F(HostResolverImplTest, AsynchronousLookup) {
int err = host_resolver->Resolve(info, &adrlist, &callback_, NULL, log);
EXPECT_EQ(ERR_IO_PENDING, err);
- EXPECT_EQ(1u, log->events().size());
+ EXPECT_EQ(1u, log->entries().size());
ExpectLogContains(log, 0, LoadLog::TYPE_HOST_RESOLVER_IMPL,
LoadLog::PHASE_BEGIN);
@@ -233,7 +233,7 @@ TEST_F(HostResolverImplTest, AsynchronousLookup) {
ASSERT_TRUE(callback_called_);
ASSERT_EQ(OK, callback_result_);
- EXPECT_EQ(2u, log->events().size());
+ EXPECT_EQ(2u, log->entries().size());
ExpectLogContains(log, 1, LoadLog::TYPE_HOST_RESOLVER_IMPL,
LoadLog::PHASE_END);
@@ -271,7 +271,7 @@ TEST_F(HostResolverImplTest, CanceledAsynchronousLookup) {
resolver_proc->Signal();
- EXPECT_EQ(3u, log->events().size());
+ EXPECT_EQ(3u, log->entries().size());
ExpectLogContains(log, 0, LoadLog::TYPE_HOST_RESOLVER_IMPL,
LoadLog::PHASE_BEGIN);
ExpectLogContains(log, 1, LoadLog::TYPE_CANCELLED, LoadLog::PHASE_NONE);
@@ -825,7 +825,7 @@ TEST_F(HostResolverImplTest, Observers) {
int rv = host_resolver->Resolve(info1, &addrlist, NULL, NULL, log);
EXPECT_EQ(OK, rv);
- EXPECT_EQ(6u, log->events().size());
+ EXPECT_EQ(6u, log->entries().size());
ExpectLogContains(log, 0, LoadLog::TYPE_HOST_RESOLVER_IMPL,
LoadLog::PHASE_BEGIN);
ExpectLogContains(log, 1, LoadLog::TYPE_HOST_RESOLVER_IMPL_OBSERVER_ONSTART,