Remove duplicate words from custom spelling dictionary on load

chrome/browser/spellchecker/spellcheck_custom_dictionary.cc

 // Copyright (c) 2012 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 "chrome/browser/spellchecker/spellcheck_custom_dictionary.h"
 
 #include <functional>
 
 #include "base/file_util.h"
 #include "base/string_split.h"
@@ skipping 39 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   std::string contents;
   file_util::ReadFileToString(custom_dictionary_path_, &contents);
   if (contents.empty()) {
     custom_words->clear();
     return;
   }
 
   base::SplitString(contents, '\n', custom_words);
+
+  // Erase duplicates.
+  std::sort(custom_words->begin(), custom_words->end());
+  WordList::iterator it = std::unique(custom_words->begin(),
+                                      custom_words->end());
+  custom_words->resize(it - custom_words->begin());

[groby-ooo-7-16, 2012/11/29 23:35:47]

nit: Use custom_words.erase instead - erase(unique(....)) is a standard idiom. 

[please use gerrit instead, 2012/11/29 23:48:03]

Done.

+
   // Clear out empty words.
   custom_words->erase(remove_if(custom_words->begin(), custom_words->end(),
     mem_fun_ref(&std::string::empty)), custom_words->end());
+
+  // Write out the clean file.
+  std::stringstream ss;
+  std::string word;
+  char separator[] = {'\n', '\0'};

[groby-ooo-7-16, 2012/11/29 23:35:47]

const char

[please use gerrit instead, 2012/11/29 23:48:03]

Done.

+  for (WordList::iterator it = custom_words->begin();
+       it != custom_words->end();
+       ++it) {
+    word = *it;
+    ss.write(word.c_str(), word.length());

[groby-ooo-7-16, 2012/11/29 23:35:47]

ss << *it << separator; // Why not this?

[please use gerrit instead, 2012/11/29 23:48:03]

Done.

+    ss.write(separator, 1);
+  }
+  contents = ss.str();
+  file_util::WriteFile(custom_dictionary_path_,
+                       contents.c_str(),
+                       contents.length());
 }
 
 void SpellcheckCustomDictionary::SetCustomWordList(WordList* custom_words) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   words_.clear();
   if (custom_words)
     std::swap(words_, *custom_words);
 
   std::vector<Observer*>::iterator it;
@@ skipping 136 matching lines @@
   return custom_words;
 }
 
 void SpellcheckCustomDictionary::SetCustomWordListAndDelete(
     WordList* custom_words) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   SetCustomWordList(custom_words);
   delete custom_words;
 }