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

Unified Diff: chrome/browser/net/dns_host_info.cc

Issue 118239: Fix purify freeze. Revert "Use a priority queue to assure that subresources are resolved asap" (Closed)
Patch Set: Created 11 years, 7 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
« no previous file with comments | « chrome/browser/net/dns_host_info.h ('k') | chrome/browser/net/dns_host_info_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/net/dns_host_info.cc
diff --git a/chrome/browser/net/dns_host_info.cc b/chrome/browser/net/dns_host_info.cc
index dbfde3bfc1c5403200765c5668f42fee6ae9f5d5..d40acd7a256a415c0384bc0d9a15c34c0532b355 100644
--- a/chrome/browser/net/dns_host_info.cc
+++ b/chrome/browser/net/dns_host_info.cc
@@ -77,7 +77,6 @@ void DnsHostInfo::set_cache_expiration(TimeDelta time) {
void DnsHostInfo::SetQueuedState(ResolutionMotivation motivation) {
DCHECK(PENDING == state_ || FOUND == state_ || NO_SUCH_NAME == state_);
- old_prequeue_state_ = state_;
state_ = QUEUED;
queue_duration_ = resolve_duration_ = kNullDuration;
SetMotivation(motivation);
@@ -93,24 +92,6 @@ void DnsHostInfo::SetAssignedState() {
UMA_HISTOGRAM_TIMES("DNS.PrefetchQueue", queue_duration_);
}
-void DnsHostInfo::RemoveFromQueue() {
- DCHECK(ASSIGNED == state_);
- state_ = old_prequeue_state_;
- DLogResultsStats("DNS Prefetch reset to prequeue");
- static const TimeDelta kBoundary = TimeDelta::FromSeconds(2);
- if (queue_duration_ > kBoundary) {
- UMA_HISTOGRAM_MEDIUM_TIMES("DNS.QueueRecycledDeltaOver2",
- queue_duration_ - kBoundary);
- return;
- }
- // Make a custom linear histogram for the region from 0 to boundary.
- const size_t kBucketCount = 52;
- static LinearHistogram histogram("DNS.QueueRecycledUnder2", TimeDelta(),
- kBoundary, kBucketCount);
- histogram.SetFlags(kUmaTargetedHistogramFlag);
- histogram.AddTime(queue_duration_);
-}
-
void DnsHostInfo::SetPendingDeleteState() {
DCHECK(ASSIGNED == state_ || ASSIGNED_BUT_MARKED == state_);
state_ = ASSIGNED_BUT_MARKED;
@@ -162,7 +143,7 @@ void DnsHostInfo::SetFinishedState(bool was_resolved) {
void DnsHostInfo::SetHostname(const std::string& hostname) {
if (hostname != hostname_) {
- DCHECK_EQ(hostname_.size(), 0u); // Not yet initialized.
+ DCHECK(hostname_.size() == 0); // Not yet initialized.
hostname_ = hostname;
}
}
@@ -190,7 +171,7 @@ bool DnsHostInfo::IsStillCached() const {
DnsBenefit DnsHostInfo::AccruePrefetchBenefits(DnsHostInfo* navigation_info) {
DCHECK(FINISHED == navigation_info->state_ ||
FINISHED_UNRESOLVED == navigation_info->state_);
- DCHECK_EQ(navigation_info->hostname_, hostname_.data());
+ DCHECK(0 == navigation_info->hostname_.compare(hostname_.data()));
if ((0 == benefits_remaining_.InMilliseconds()) ||
(FOUND != state_ && NO_SUCH_NAME != state_)) {
« no previous file with comments | « chrome/browser/net/dns_host_info.h ('k') | chrome/browser/net/dns_host_info_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698