Implement LoadLog, and hook up HostResolverImpl to LoadLog.

The functionality in load_log_util.h is currently unused, but since it motivates the implementation of LoadLog, figured it should be included with this review.

Note that I decided against defining the loggable event types as LoadStates, since I wanted more flexibility in adding crazy stuff, and they really seem too implementation specific to be in LoadStates.

BUG=http://crbug.com/14478
TEST=net_unittests
Review URL: http://codereview.chromium.org/165404

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23412 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 45 insertions, 4 deletions

diff --git a/net/base/host_resolver_impl_unittest.cc b/net/base/host_resolver_impl_unittest.cc
index e33bbf4e..c59e477 100644
--- a/net/base/host_resolver_impl_unittest.cc
+++ b/net/base/host_resolver_impl_unittest.cc
@@ -18,12 +18,14 @@
 #include "base/ref_counted.h"
 #include "net/base/address_list.h"
 #include "net/base/completion_callback.h"
+#include "net/base/load_log_unittest.h"
 #include "net/base/mock_host_resolver.h"
 #include "net/base/net_errors.h"
 #include "net/base/test_completion_callback.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using net::HostResolverImpl;
+using net::LoadLog;
 using net::RuleBasedHostResolverProc;
 using net::WaitingHostResolverProc;
 
@@ -187,9 +189,16 @@ TEST_F(HostResolverImplTest, SynchronousLookup) {
       new HostResolverImpl(resolver_proc, kMaxCacheEntries, kMaxCacheAgeMs));
 
   net::HostResolver::RequestInfo info("just.testing", kPortnum);
-  int err = host_resolver->Resolve(NULL, info, &adrlist, NULL, NULL);
+  scoped_refptr<LoadLog> log(new LoadLog);
+  int err = host_resolver->Resolve(log, info, &adrlist, NULL, NULL);
   EXPECT_EQ(net::OK, err);
 
+  EXPECT_EQ(2u, log->events().size());
+  net::ExpectLogContains(log, 0, LoadLog::TYPE_HOST_RESOLVER_IMPL,
+      LoadLog::PHASE_BEGIN);
+  net::ExpectLogContains(log, 1, LoadLog::TYPE_HOST_RESOLVER_IMPL,
+      LoadLog::PHASE_END);
+
   const struct addrinfo* ainfo = adrlist.head();
   EXPECT_EQ(static_cast<addrinfo*>(NULL), ainfo->ai_next);
   EXPECT_EQ(sizeof(struct sockaddr_in), ainfo->ai_addrlen);
@@ -212,14 +221,23 @@ TEST_F(HostResolverImplTest, AsynchronousLookup) {
       new HostResolverImpl(resolver_proc, kMaxCacheEntries, kMaxCacheAgeMs));
 
   net::HostResolver::RequestInfo info("just.testing", kPortnum);
-  int err = host_resolver->Resolve(NULL, info, &adrlist, &callback_, NULL);
+  scoped_refptr<LoadLog> log(new LoadLog);
+  int err = host_resolver->Resolve(log, info, &adrlist, &callback_, NULL);
   EXPECT_EQ(net::ERR_IO_PENDING, err);
 
+  EXPECT_EQ(1u, log->events().size());
+  net::ExpectLogContains(
+      log, 0, LoadLog::TYPE_HOST_RESOLVER_IMPL, LoadLog::PHASE_BEGIN);
+
   MessageLoop::current()->Run();
 
   ASSERT_TRUE(callback_called_);
   ASSERT_EQ(net::OK, callback_result_);
 
+  EXPECT_EQ(2u, log->events().size());
+  net::ExpectLogContains(log, 1, LoadLog::TYPE_HOST_RESOLVER_IMPL,
+      LoadLog::PHASE_END);
+
   const struct addrinfo* ainfo = adrlist.head();
   EXPECT_EQ(static_cast<addrinfo*>(NULL), ainfo->ai_next);
   EXPECT_EQ(sizeof(struct sockaddr_in), ainfo->ai_addrlen);
@@ -234,6 +252,7 @@ TEST_F(HostResolverImplTest, CanceledAsynchronousLookup) {
   scoped_refptr<WaitingHostResolverProc> resolver_proc =
       new WaitingHostResolverProc(NULL);
 
+  scoped_refptr<LoadLog> log(new LoadLog);
   {
     scoped_refptr<net::HostResolver> host_resolver(
         new HostResolverImpl(resolver_proc, kMaxCacheEntries, kMaxCacheAgeMs));
@@ -241,7 +260,7 @@ TEST_F(HostResolverImplTest, CanceledAsynchronousLookup) {
     const int kPortnum = 80;
 
     net::HostResolver::RequestInfo info("just.testing", kPortnum);
-    int err = host_resolver->Resolve(NULL, info, &adrlist, &callback_, NULL);
+    int err = host_resolver->Resolve(log, info, &adrlist, &callback_, NULL);
     EXPECT_EQ(net::ERR_IO_PENDING, err);
 
     // Make sure we will exit the queue even when callback is not called.
@@ -253,6 +272,13 @@ TEST_F(HostResolverImplTest, CanceledAsynchronousLookup) {
 
   resolver_proc->Signal();
 
+  EXPECT_EQ(3u, log->events().size());
+  net::ExpectLogContains(log, 0, LoadLog::TYPE_HOST_RESOLVER_IMPL,
+      LoadLog::PHASE_BEGIN);
+  net::ExpectLogContains(log, 1, LoadLog::TYPE_CANCELLED, LoadLog::PHASE_NONE);
+  net::ExpectLogContains(log, 2, LoadLog::TYPE_HOST_RESOLVER_IMPL,
+      LoadLog::PHASE_END);
+
   EXPECT_FALSE(callback_called_);
 }
 
@@ -801,9 +827,24 @@ TEST_F(HostResolverImplTest, Observers) {
 
   // Resolve "host1".
   net::HostResolver::RequestInfo info1("host1", 70);
-  int rv = host_resolver->Resolve(NULL, info1, &addrlist, NULL, NULL);
+  scoped_refptr<LoadLog> log(new LoadLog);
+  int rv = host_resolver->Resolve(log, info1, &addrlist, NULL, NULL);
   EXPECT_EQ(net::OK, rv);
 
+  EXPECT_EQ(6u, log->events().size());
+  net::ExpectLogContains(log, 0,
+      LoadLog::TYPE_HOST_RESOLVER_IMPL, LoadLog::PHASE_BEGIN);
+  net::ExpectLogContains(log, 1,
+      LoadLog::TYPE_HOST_RESOLVER_IMPL_OBSERVER_ONSTART, LoadLog::PHASE_BEGIN);
+  net::ExpectLogContains(log, 2,
+      LoadLog::TYPE_HOST_RESOLVER_IMPL_OBSERVER_ONSTART, LoadLog::PHASE_END);
+  net::ExpectLogContains(log, 3,
+      LoadLog::TYPE_HOST_RESOLVER_IMPL_OBSERVER_ONFINISH, LoadLog::PHASE_BEGIN);
+  net::ExpectLogContains(log, 4,
+      LoadLog::TYPE_HOST_RESOLVER_IMPL_OBSERVER_ONFINISH, LoadLog::PHASE_END);
+  net::ExpectLogContains(log, 5,
+      LoadLog::TYPE_HOST_RESOLVER_IMPL, LoadLog::PHASE_END);
+
   EXPECT_EQ(1U, observer.start_log.size());
   EXPECT_EQ(1U, observer.finish_log.size());
   EXPECT_EQ(0U, observer.cancel_log.size());