diff options
| author | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-12 03:09:11 +0000 |
|---|---|---|
| committer | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-12 03:09:11 +0000 |
| commit | 489d1a8055c3ed8389630cd537999a6715eaa4a5 (patch) | |
| tree | 2b4315dec568337f68b5b615bff663f71463a031 /net/dns/dns_transaction.cc | |
| parent | 3218f80dfc2d5310d6078f55bf535df303f1d9d9 (diff) | |
| download | chromium_src-489d1a8055c3ed8389630cd537999a6715eaa4a5.zip chromium_src-489d1a8055c3ed8389630cd537999a6715eaa4a5.tar.gz chromium_src-489d1a8055c3ed8389630cd537999a6715eaa4a5.tar.bz2 | |
Add GetHostCache to HostResolver interface, and use the
new method to hook up AsyncHostResolver to
about:net-internals#dns and to clear DNS cache hooks.
Also fix up DNSTransaction's NetLog logging a little.
R=eroman,cbentzel,szym
BUG=99847
TEST=manual
Review URL: http://codereview.chromium.org/8233013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104988 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/dns/dns_transaction.cc')
| -rw-r--r-- | net/dns/dns_transaction.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc index 30fd7bf..a7fa922 100644 --- a/net/dns/dns_transaction.cc +++ b/net/dns/dns_transaction.cc @@ -84,7 +84,8 @@ class DnsTransactionStartParameters : public NetLog::EventParameters { dict->SetString("dns_server", dns_server_.ToString()); dict->SetString("hostname", hostname); dict->SetInteger("query_type", key_.second); - dict->Set("source_dependency", source_.ToValue()); + if (source_.is_valid()) + dict->Set("source_dependency", source_.ToValue()); return dict; } @@ -107,7 +108,8 @@ class DnsTransactionFinishParameters : public NetLog::EventParameters { list->Append(Value::CreateStringValue(IPAddressToString(*it))); DictionaryValue* dict = new DictionaryValue(); - dict->SetInteger("net_error", net_error_); + if (net_error_) + dict->SetInteger("net_error", net_error_); dict->Set("address_list", list); return dict; } @@ -247,7 +249,7 @@ int DnsTransaction::DoConnect() { socket_.reset(socket_factory_->CreateDatagramClientSocket( DatagramSocket::RANDOM_BIND, base::Bind(&base::RandInt), - NULL, + net_log_.net_log(), net_log_.source())); net_log_.AddEvent( |