Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(243)

Unified Diff: net/dns/dns_transaction.cc

Issue 2351513002: net: rename BoundNetLog to NetLogWithSource (Closed)
Patch Set: one more fix, content bound_net_log_ Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/dns/dns_transaction.cc
diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc
index 4a7ce7ee22e7ab8c7101de2f0444a375deaa1d9d..4b8cd12670e94543b1cb6fd8f90c027540b24d75 100644
--- a/net/dns/dns_transaction.cc
+++ b/net/dns/dns_transaction.cc
@@ -97,7 +97,7 @@ class DnsAttempt {
virtual const DnsResponse* GetResponse() const = 0;
// Returns the net log bound to the source of the socket.
- virtual const BoundNetLog& GetSocketNetLog() const = 0;
+ virtual const NetLogWithSource& GetSocketNetLog() const = 0;
// Returns the index of the destination server within DnsConfig::nameservers.
unsigned server_index() const { return server_index_; }
@@ -165,7 +165,7 @@ class DnsUDPAttempt : public DnsAttempt {
return (resp != NULL && resp->IsValid()) ? resp : NULL;
}
- const BoundNetLog& GetSocketNetLog() const override {
+ const NetLogWithSource& GetSocketNetLog() const override {
return socket_lease_->socket()->NetLog();
}
@@ -334,7 +334,7 @@ class DnsTCPAttempt : public DnsAttempt {
return (resp != NULL && resp->IsValid()) ? resp : NULL;
}
- const BoundNetLog& GetSocketNetLog() const override {
+ const NetLogWithSource& GetSocketNetLog() const override {
return socket_->NetLog();
}
@@ -563,7 +563,7 @@ class DnsTransactionImpl : public DnsTransaction,
const std::string& hostname,
uint16_t qtype,
const DnsTransactionFactory::CallbackType& callback,
- const BoundNetLog& net_log)
+ const NetLogWithSource& net_log)
: session_(session),
hostname_(hostname),
qtype_(qtype),
@@ -950,7 +950,7 @@ class DnsTransactionImpl : public DnsTransaction,
// Cleared in DoCallback.
DnsTransactionFactory::CallbackType callback_;
- BoundNetLog net_log_;
+ NetLogWithSource net_log_;
// Search list of fully-qualified DNS names to query next (in DNS format).
std::deque<std::string> qnames_;
@@ -984,7 +984,7 @@ class DnsTransactionFactoryImpl : public DnsTransactionFactory {
const std::string& hostname,
uint16_t qtype,
const CallbackType& callback,
- const BoundNetLog& net_log) override {
+ const NetLogWithSource& net_log) override {
return std::unique_ptr<DnsTransaction>(new DnsTransactionImpl(
session_.get(), hostname, qtype, callback, net_log));
}

Powered by Google App Engine
This is Rietveld 408576698