From 2bb044402ba016977b58014a22b0631ab7ed605d Mon Sep 17 00:00:00 2001 From: "mmenke@chromium.org" <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Date: Wed, 18 Aug 2010 18:01:15 +0000 Subject: Revert 56539 - 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 TBR=eroman@chromium.org Review URL: http://codereview.chromium.org/3137022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56556 0039d316-1c4b-4281-b951-d872f2087c98 --- net/base/net_log.cc | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'net/base/net_log.cc') diff --git a/net/base/net_log.cc b/net/base/net_log.cc index c91306c..adf8381 100644 --- a/net/base/net_log.cc +++ b/net/base/net_log.cc @@ -11,13 +11,6 @@ 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) { @@ -176,7 +169,11 @@ Value* NetLogStringParameter::ToValue() const { Value* NetLogSourceParameter::ToValue() const { DictionaryValue* dict = new DictionaryValue(); - dict->Set(name_, value_.ToValue()); + 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); return dict; } -- cgit v1.1