Refactoring of job dispatch in HostResolverImpl in preparation for DnsClient.

chrome/browser/net/passive_log_collector.cc

Index: chrome/browser/net/passive_log_collector.cc
diff --git a/chrome/browser/net/passive_log_collector.cc b/chrome/browser/net/passive_log_collector.cc
index d7b93e0ba83beca6cba5f3c424afa0586d104861..8b17ab97c398b1b7b86f822db5ecfada50650271 100644
--- a/chrome/browser/net/passive_log_collector.cc
+++ b/chrome/browser/net/passive_log_collector.cc
@@ -72,6 +72,8 @@ PassiveLogCollector::PassiveLogCollector()
   trackers_[net::NetLog::SOURCE_HOST_RESOLVER_IMPL_REQUEST] =
       &dns_request_tracker_;
   trackers_[net::NetLog::SOURCE_HOST_RESOLVER_IMPL_JOB] = &dns_job_tracker_;
+  trackers_[net::NetLog::SOURCE_HOST_RESOLVER_IMPL_PROC_TASK] =
+      &dns_proc_task_tracker_;
   trackers_[net::NetLog::SOURCE_DISK_CACHE_ENTRY] = &disk_cache_entry_tracker_;
   trackers_[net::NetLog::SOURCE_MEMORY_CACHE_ENTRY] = &mem_cache_entry_tracker_;
   trackers_[net::NetLog::SOURCE_HTTP_STREAM_JOB] = &http_stream_job_tracker_;
@@ -536,18 +538,20 @@ PassiveLogCollector::SpdySessionTracker::DoAddEntry(
 }
 
 //----------------------------------------------------------------------------
-// DNSRequestTracker
+// HostResolverRequestTracker
 //----------------------------------------------------------------------------
 
-const size_t PassiveLogCollector::DNSRequestTracker::kMaxNumSources = 200;
-const size_t PassiveLogCollector::DNSRequestTracker::kMaxGraveyardSize = 20;
+const size_t
+PassiveLogCollector::HostResolverRequestTracker::kMaxNumSources = 200;
+const size_t
+PassiveLogCollector::HostResolverRequestTracker::kMaxGraveyardSize = 20;
 
-PassiveLogCollector::DNSRequestTracker::DNSRequestTracker()
+PassiveLogCollector::HostResolverRequestTracker::HostResolverRequestTracker()
     : SourceTracker(kMaxNumSources, kMaxGraveyardSize, NULL) {
 }
 
 PassiveLogCollector::SourceTracker::Action
-PassiveLogCollector::DNSRequestTracker::DoAddEntry(
+PassiveLogCollector::HostResolverRequestTracker::DoAddEntry(
     const ChromeNetLog::Entry& entry, SourceInfo* out_info) {
   AddEntryToSourceInfo(entry, out_info);
   if (entry.type == net::NetLog::TYPE_HOST_RESOLVER_IMPL_REQUEST &&
@@ -558,19 +562,21 @@ PassiveLogCollector::DNSRequestTracker::DoAddEntry(
 }
 
 //----------------------------------------------------------------------------
-// DNSJobTracker
+// HostResolverJobTracker
 //----------------------------------------------------------------------------
 
-const size_t PassiveLogCollector::DNSJobTracker::kMaxNumSources = 100;
-const size_t PassiveLogCollector::DNSJobTracker::kMaxGraveyardSize = 15;
+const size_t
+PassiveLogCollector::HostResolverJobTracker::kMaxNumSources = 100;
+const size_t
+PassiveLogCollector::HostResolverJobTracker::kMaxGraveyardSize = 15;
 
-PassiveLogCollector::DNSJobTracker::DNSJobTracker()
+PassiveLogCollector::HostResolverJobTracker::HostResolverJobTracker()
     : SourceTracker(kMaxNumSources, kMaxGraveyardSize, NULL) {
 }
 
 PassiveLogCollector::SourceTracker::Action
-PassiveLogCollector::DNSJobTracker::DoAddEntry(const ChromeNetLog::Entry& entry,
-                                               SourceInfo* out_info) {
+PassiveLogCollector::HostResolverJobTracker::DoAddEntry(
+    const ChromeNetLog::Entry& entry, SourceInfo* out_info) {
   AddEntryToSourceInfo(entry, out_info);
   if (entry.type == net::NetLog::TYPE_HOST_RESOLVER_IMPL_JOB &&
       entry.phase == net::NetLog::PHASE_END) {
@@ -580,6 +586,30 @@ PassiveLogCollector::DNSJobTracker::DoAddEntry(const ChromeNetLog::Entry& entry,
 }
 
 //----------------------------------------------------------------------------
+// HostResolverProcTaskTracker
+//----------------------------------------------------------------------------
+
+const size_t
+PassiveLogCollector::HostResolverProcTaskTracker::kMaxNumSources = 100;
+const size_t
+PassiveLogCollector::HostResolverProcTaskTracker::kMaxGraveyardSize = 15;
+
+PassiveLogCollector::HostResolverProcTaskTracker::HostResolverProcTaskTracker()
+    : SourceTracker(kMaxNumSources, kMaxGraveyardSize, NULL) {
+}
+
+PassiveLogCollector::SourceTracker::Action
+PassiveLogCollector::HostResolverProcTaskTracker::DoAddEntry(
+    const ChromeNetLog::Entry& entry, SourceInfo* out_info) {
+  AddEntryToSourceInfo(entry, out_info);
+  if (entry.type == net::NetLog::TYPE_HOST_RESOLVER_IMPL_PROC_TASK &&
+      entry.phase == net::NetLog::PHASE_END) {
+    return ACTION_MOVE_TO_GRAVEYARD;
+  }
+  return ACTION_NONE;
+}
+
+//----------------------------------------------------------------------------
 // DiskCacheEntryTracker
 //----------------------------------------------------------------------------