Added HostResolveImpl Requests and Jobs to log.

ConnectJobs point to the requests, Requests point back to ConnectJobs and to the DNS lookup they were attached to, if any.

Also CONNECT_JOBs are now identified by their host/port on the Requests list.


BUG= 46844
TEST= Look at the net-internals screen.


Review URL: http://codereview.chromium.org/3080034

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

1 files changed, 8 insertions, 5 deletions

diff --git a/net/base/net_log.cc b/net/base/net_log.cc
index adf8381..c91306c 100644
--- a/net/base/net_log.cc
+++ b/net/base/net_log.cc
@@ -11,6 +11,13 @@
 
 namespace net {
 
+Value* NetLog::Source::ToValue() const {
+  DictionaryValue* dict = new DictionaryValue();
+  dict->SetInteger("type", static_cast<int>(type));
+  dict->SetInteger("id", static_cast<int>(id));
+  return dict;
+}
+
 // static
 const char* NetLog::EventTypeToString(EventType event) {
   switch (event) {
@@ -169,11 +176,7 @@ Value* NetLogStringParameter::ToValue() const {
 Value* NetLogSourceParameter::ToValue() const {
   DictionaryValue* dict = new DictionaryValue();
 
-  DictionaryValue* source_dict = new DictionaryValue();
-  source_dict->SetInteger("type", static_cast<int>(value_.type));
-  source_dict->SetInteger("id", static_cast<int>(value_.id));
-
-  dict->Set(name_, source_dict);
+  dict->Set(name_, value_.ToValue());
   return dict;
 }