Add HasWord(string) method to SpellcheckCustomDictionary

chrome/browser/sync/test/integration/dictionary_helper.cc

 // Copyright (c) 2011 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/sync/test/integration/dictionary_helper.h"
 
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/spellchecker/spellcheck_factory.h"
 #include "chrome/browser/spellchecker/spellcheck_service.h"
 #include "chrome/browser/sync/profile_sync_service_harness.h"
 #include "chrome/browser/sync/test/integration/dictionary_load_observer.h"
 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/spellcheck_common.h"
 #include "content/public/test/test_utils.h"
 
 class DictionarySyncIntegrationTestHelper {
  public:
   // Same as SpellcheckCustomDictionary::AddWord/RemoveWord, except does not
   // write to disk.
   static bool ApplyChange(
       SpellcheckCustomDictionary* dictionary,
       SpellcheckCustomDictionary::Change& change) {
-    std::sort(dictionary->words_.begin(), dictionary->words_.end());
     int result = change.Sanitize(dictionary->GetWords());
     dictionary->Apply(change);
     dictionary->Notify(change);
     dictionary->Sync(change);
     return !result;
   }
 
   DISALLOW_COPY_AND_ASSIGN(DictionarySyncIntegrationTestHelper);
 };
 
@@ skipping 63 matching lines @@
 
 size_t GetDictionarySize(int index) {
   return GetDictionary(index)->GetWords().size();
 }
 
 size_t GetVerifierDictionarySize() {
   return GetVerifierDictionary()->GetWords().size();
 }
 
 bool DictionariesMatch() {
-  chrome::spellcheck_common::WordList reference =
+  chrome::spellcheck_common::WordSet reference =
       sync_datatype_helper::test()->use_verifier() ?
       GetVerifierDictionary()->GetWords() : GetDictionary(0)->GetWords();
   for (int i = 0; i < sync_datatype_helper::test()->num_clients(); ++i) {
     if (reference.size() != GetDictionary(i)->GetWords().size())
       return false;
   }
-  for (chrome::spellcheck_common::WordList::iterator it = reference.begin();
+  for (chrome::spellcheck_common::WordSet::iterator it = reference.begin();
        it != reference.end();
        ++it) {
     if (!HaveWordMatches(*it))
       return false;
   }
   return true;
 }
 
 bool DictionaryMatchesVerifier(int index) {
-  chrome::spellcheck_common::WordList expected =
+  chrome::spellcheck_common::WordSet expected =
       GetVerifierDictionary()->GetWords();
-  chrome::spellcheck_common::WordList actual = GetDictionary(index)->GetWords();
+  chrome::spellcheck_common::WordSet actual = GetDictionary(index)->GetWords();
   if (expected.size() != actual.size())
     return false;
-  for (chrome::spellcheck_common::WordList::iterator it = expected.begin();
+  for (chrome::spellcheck_common::WordSet::iterator it = expected.begin();
        it != expected.end();
        ++it) {
     if (actual.end() == std::find(actual.begin(), actual.end(), *it))
       return false;
   }
   return true;
 }
 
 bool AddWord(int index, const std::string& word) {
   SpellcheckCustomDictionary::Change dictionary_change;
@@ skipping 13 matching lines @@
   bool result = DictionarySyncIntegrationTestHelper::ApplyChange(
       GetDictionary(index), dictionary_change);
   if (sync_datatype_helper::test()->use_verifier()) {
     result &= DictionarySyncIntegrationTestHelper::ApplyChange(
         GetVerifierDictionary(), dictionary_change);
   }
   return result;
 }
 
 }  // namespace dictionary_helper