Clean up Simple Index handling of removed entries.

net/disk_cache/simple/simple_index.cc

 // Copyright (c) 2013 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 "net/disk_cache/simple/simple_index.h"
 
 #include <limits>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 365 matching lines @@
   cache_size_ -= (*it)->second.GetEntrySize();
   cache_size_ += entry_size;
   (*it)->second.SetEntrySize(entry_size);
 }
 
 void SimpleIndex::MergeInitializingSet(
     scoped_ptr<SimpleIndexLoadResult> load_result) {
   DCHECK(io_thread_checker_.CalledOnValidThread());
   DCHECK(load_result->did_load);
 
-  SimpleIndex::EntrySet* index_file_entries = &load_result->entries;
-  // First, remove the entries that are in the |removed_entries_| from both
-  // sets.
-  for (base::hash_set<uint64>::const_iterator it =
-           removed_entries_.begin(); it != removed_entries_.end(); ++it) {
-    entries_set_.erase(*it);
+  EntrySet* index_file_entries = &load_result->entries;
+
+  for (base::hash_set<uint64>::const_iterator it = removed_entries_.begin();
+       it != removed_entries_.end(); ++it) {
     index_file_entries->erase(*it);
   }
+  removed_entries_.clear();
 
   for (EntrySet::const_iterator it = entries_set_.begin();
        it != entries_set_.end(); ++it) {
     const uint64 entry_hash = it->first;
     std::pair<EntrySet::iterator, bool> insert_result =
         index_file_entries->insert(EntrySet::value_type(entry_hash,
                                                         EntryMetadata()));
     EntrySet::iterator& possibly_inserted_entry = insert_result.first;
     possibly_inserted_entry->second = it->second;
   }
 
   uint64 merged_cache_size = 0;
   for (EntrySet::iterator it = index_file_entries->begin();
        it != index_file_entries->end(); ++it) {
     merged_cache_size += it->second.GetEntrySize();
   }
 
   entries_set_.swap(*index_file_entries);
   cache_size_ = merged_cache_size;
   initialized_ = true;
-  removed_entries_.clear();
 
   // The actual IO is asynchronous, so calling WriteToDisk() shouldn't slow the
   // merge down much.
   if (load_result->flush_required)
     WriteToDisk();
 
   UMA_HISTOGRAM_CUSTOM_COUNTS("SimpleCache.IndexInitializationWaiters",
                               to_run_when_initialized_.size(), 0, 100, 20);
   // Run all callbacks waiting for the index to come up.
   for (CallbackList::iterator it = to_run_when_initialized_.begin(),
@@ skipping 68 matching lines @@
         entries_set_.erase(it++);
         continue;
       }
     }
     ++it;
   }
   return ret_hashes.Pass();
 }
 
 }  // namespace disk_cache