Cheer up spell-checking code

chrome/browser/spellchecker/feedback.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.
 //
 // The |Feedback| object keeps track of each instance of user feedback in a map
 // |misspellings_|. This is a map from uint32_t hashes to |Misspelling| objects.
 //
 // Each misspelling should be present in only one renderer process. The
 // |Feedback| objects keeps track of misspelling-renderer relationship in the
 // |renderers_| map of renderer process identifiers to a set of hashes.
 //
 // When the user adds a misspelling to their custom dictionary, all of the
 // |Misspelling| objects with the same misspelled string are updated. The
 // |Feedback| object facilitates efficient access to these misspellings through
 // a |text_| map of misspelled strings to a set of hashes.
 
 #include "chrome/browser/spellchecker/feedback.h"
 
 #include <algorithm>
 #include <iterator>
 #include <limits>
 
 #include "base/logging.h"
 #include "base/stl_util.h"

[please use gerrit instead, 2016/02/03 23:59:10]

No longer need this include.

[Kevin Bailey, 2016/02/04 16:34:10]

Done.

+#include "chrome/browser/spellchecker/set_difference_container.h"
 
 namespace spellcheck {
 
 Feedback::Feedback(size_t max_total_text_size)
     : max_total_text_size_(max_total_text_size), total_text_size_(0) {
   DCHECK_GE(max_total_text_size, 1024U);
 }
 
 Feedback::~Feedback() {}
 
 Misspelling* Feedback::GetMisspelling(uint32_t hash) {
   HashMisspellingMap::iterator misspelling_it = misspellings_.find(hash);
   if (misspelling_it == misspellings_.end())
     return NULL;

[please use gerrit instead, 2016/02/03 23:59:10]

Let's switch to nullptr in all of the files that you modify.

[Kevin Bailey, 2016/02/04 16:34:10]

Done (I think).

   return &misspelling_it->second;
 }
 
 void Feedback::FinalizeRemovedMisspellings(
     int renderer_process_id,
     const std::vector<uint32_t>& remaining_markers) {
   RendererHashesMap::iterator renderer_it =
       renderers_.find(renderer_process_id);
   if (renderer_it == renderers_.end() || renderer_it->second.empty())
     return;
   HashCollection& renderer_hashes = renderer_it->second;
   HashCollection remaining_hashes(remaining_markers.begin(),
                                   remaining_markers.end());
-  std::vector<uint32_t> removed_hashes =
-      base::STLSetDifference<std::vector<uint32_t>>(renderer_hashes,
-                                                    remaining_hashes);
-  for (std::vector<uint32_t>::const_iterator hash_it = removed_hashes.begin();
-       hash_it != removed_hashes.end(); ++hash_it) {
-    HashMisspellingMap::iterator misspelling_it = misspellings_.find(*hash_it);
+  spellcheck::set_difference_container<HashCollection, HashCollection>
+      removed_hashes(renderer_hashes, remaining_hashes);
+  for (auto hash : removed_hashes) {
+    HashMisspellingMap::iterator misspelling_it = misspellings_.find(hash);
     if (misspelling_it != misspellings_.end() &&
         !misspelling_it->second.action.IsFinal()) {
       misspelling_it->second.action.Finalize();
     }
   }
 }
 
 bool Feedback::RendererHasMisspellings(int renderer_process_id) const {
   RendererHashesMap::const_iterator renderer_it =
       renderers_.find(renderer_process_id);
@@ skipping 122 matching lines @@
   renderers_.clear();
 }
 
 const std::set<uint32_t>& Feedback::FindMisspellings(
     const base::string16& misspelled_text) const {
   const TextHashesMap::const_iterator text_it = text_.find(misspelled_text);
   return text_it == text_.end() ? empty_hash_collection_ : text_it->second;
 }
 
 }  // namespace spellcheck