summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-31 18:13:20 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-31 18:13:20 +0000
commit7e9af81834cc012131ca509808c8c6b73cc05604 (patch)
treed2a8d58f5c0e26584507ef87aea1397d013716b2 /chrome
parente81283bbf1beafe0a5dafbca2e7484b1d7a6a055 (diff)
downloadchromium_src-7e9af81834cc012131ca509808c8c6b73cc05604.zip
chromium_src-7e9af81834cc012131ca509808c8c6b73cc05604.tar.gz
chromium_src-7e9af81834cc012131ca509808c8c6b73cc05604.tar.bz2
Revert r58019 and r58007 due to flaky.
Blargh, there are race conditions in UI->IO MessageLoop passing. Need to fix them. BUG=53965,53386 Review URL: http://codereview.chromium.org/3215012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58023 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/net/passive_log_collector.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/browser/net/passive_log_collector.cc b/chrome/browser/net/passive_log_collector.cc
index 3181ad9..adc6500 100644
--- a/chrome/browser/net/passive_log_collector.cc
+++ b/chrome/browser/net/passive_log_collector.cc
@@ -250,8 +250,6 @@ void PassiveLogCollector::SourceTracker::AddToDeletionQueue(
DCHECK_GE(sources_.find(source_id)->second.reference_count, 0);
DCHECK_LE(deletion_queue_.size(), max_graveyard_size_);
- DCHECK(std::find(deletion_queue_.begin(), deletion_queue_.end(),
- source_id) == deletion_queue_.end());
deletion_queue_.push_back(source_id);
// After the deletion queue has reached its maximum size, start
@@ -535,3 +533,4 @@ PassiveLogCollector::DNSJobTracker::DoAddEntry(const Entry& entry,
return ACTION_NONE;
}
}
+