1 files changed, 12 insertions, 16 deletions
diff --git a/net/http/http_cache.cc b/net/http/http_cache.cc
index 5b926ea..867d003 100644
--- a/net/http/http_cache.cc
+++ b/net/http/http_cache.cc
@@ -99,8 +99,7 @@ class HttpCache::WorkItem {
 
   // Calls back the transaction with the result of the operation.
   void NotifyTransaction(int result, ActiveEntry* entry) {
-    // TODO(rvargas): convert to DCHECK after fixing bug 47895.
-    CHECK(!entry || entry->disk_entry);
+    DCHECK(!entry || entry->disk_entry);
     if (entry_)
       *entry_ = entry;
     if (trans_)
@@ -573,21 +572,20 @@ HttpCache::ActiveEntry* HttpCache::ActivateEntry(
 }
 
 void HttpCache::DeactivateEntry(ActiveEntry* entry) {
-  // TODO(rvargas): convert to DCHECKs after fixing bug 47895.
-  CHECK(!entry->will_process_pending_queue);
-  CHECK(!entry->doomed);
-  CHECK(!entry->writer);
-  CHECK(entry->disk_entry);
-  CHECK(entry->readers.empty());
-  CHECK(entry->pending_queue.empty());
+  DCHECK(!entry->will_process_pending_queue);
+  DCHECK(!entry->doomed);
+  DCHECK(!entry->writer);
+  DCHECK(entry->disk_entry);
+  DCHECK(entry->readers.empty());
+  DCHECK(entry->pending_queue.empty());
 
   std::string key = entry->disk_entry->GetKey();
   if (key.empty())
     return SlowDeactivateEntry(entry);
 
   ActiveEntriesMap::iterator it = active_entries_.find(key);
-  CHECK(it != active_entries_.end());
-  CHECK(it->second == entry);
+  DCHECK(it != active_entries_.end());
+  DCHECK(it->second == entry);
 
   active_entries_.erase(it);
   delete entry;
@@ -706,9 +704,8 @@ void HttpCache::DestroyEntry(ActiveEntry* entry) {
 }
 
 int HttpCache::AddTransactionToEntry(ActiveEntry* entry, Transaction* trans) {
-  // TODO(rvargas): convert to DCHECKs after fixing bug 47895.
-  CHECK(entry);
-  CHECK(entry->disk_entry);
+  DCHECK(entry);
+  DCHECK(entry->disk_entry);
 
   // We implement a basic reader/writer lock for the disk cache entry.  If
   // there is already a writer, then everyone has to wait for the writer to
@@ -915,8 +912,7 @@ void HttpCache::ProcessPendingQueue(ActiveEntry* entry) {
 
 void HttpCache::OnProcessPendingQueue(ActiveEntry* entry) {
   entry->will_process_pending_queue = false;
-  // TODO(rvargas): convert to DCHECK after fixing bug 47895.
-  CHECK(!entry->writer);
+  DCHECK(!entry->writer);
 
   // If no one is interested in this entry, then we can de-activate it.
   if (entry->pending_queue.empty()) {