Add tests for the cache deletion in BrowsingDataRemover

components/browsing_data/conditional_cache_deletion_helper.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/browsing_data/conditional_cache_deletion_helper.h"
 
 #include "base/callback.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace {
@@ skipping 44 matching lines @@
 
   IterateOverEntries(net::OK);
   return net::ERR_IO_PENDING;
 }
 
 ConditionalCacheDeletionHelper::~ConditionalCacheDeletionHelper() {
 }
 
 void ConditionalCacheDeletionHelper::IterateOverEntries(int error) {
   while (error != net::ERR_IO_PENDING) {
-    // Delete the entry obtained in the previous iteration. The iterator is
-    // already one step forward, so it won't be invalidated.
-    if (previous_entry_ && condition_.Run(previous_entry_))
+    // If the entry obtained in the previous iteration matches the condition,
+    // mark it for deletion. The iterator is already one step forward, so it
+    // won't be invalidated. Always close the previous entry so it does not
+    // leak.
+    if (previous_entry_) {
+      if (condition_.Run(previous_entry_))
         previous_entry_->Doom();
+      previous_entry_->Close();
+    }
 
     if (error == net::ERR_FAILED) {
       // The iteration finished successfuly or we can no longer iterate
       // (e.g. the cache was destroyed). We cannot distinguish between the two,
       // but we know that there is nothing more that we can do, so we return OK.
       base::MessageLoop::current()->task_runner()->PostTask(
           FROM_HERE, base::Bind(completion_callback_, net::OK));
       base::MessageLoop::current()->DeleteSoon(FROM_HERE, this);
       return;
     }
 
     previous_entry_ = current_entry_;
     error = iterator_->OpenNextEntry(
         &current_entry_,
         base::Bind(&ConditionalCacheDeletionHelper::IterateOverEntries,
                    base::Unretained(this)));
   }
 }
 
 }  // namespace browsing_data