Move Mac to using renderer spellchecker.

chrome/renderer/spellchecker/spellcheck_unittest.cc

 // Copyright (c) 2006-2008 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 "webkit/glue/webkit_glue.h"
 
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
+#include "base/platform_file.h"
 #include "base/sys_string_conversions.h"
-#include "chrome/browser/chrome_thread.h"
-#include "chrome/browser/spellchecker.h"
-#include "chrome/browser/spellchecker_platform_engine.h"
+#include "chrome/renderer/spellchecker/spellcheck.h"
 #include "chrome/common/chrome_paths.h"
+#include "chrome/common/spellcheck_common.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
-const FilePath::CharType kTempCustomDictionaryFile[] =
-    FILE_PATH_LITERAL("temp_custom_dictionary.txt");
-}  // namespace
-
-class SpellCheckTest : public testing::Test {
- public:
-  SpellCheckTest()
-      : file_thread_(ChromeThread::FILE, &message_loop_),
-        io_thread_(ChromeThread::IO, &message_loop_) {}
-
- protected:
-  MessageLoop message_loop_;
-
- private:
-  ChromeThread file_thread_;
-  ChromeThread io_thread_;  // To keep DCHECKs inside spell checker happy.
-};
 
 // Represents a special initialization function used only for the unit tests
 // in this file.
 extern void InitHunspellWithFiles(FILE* file_aff_hunspell,
                                   FILE* file_dic_hunspell);
 
 FilePath GetHunspellDirectory() {
   FilePath hunspell_directory;
   if (!PathService::Get(base::DIR_SOURCE_ROOT, &hunspell_directory))
     return FilePath();
 
   hunspell_directory = hunspell_directory.AppendASCII("third_party");
   hunspell_directory = hunspell_directory.AppendASCII("hunspell");
   hunspell_directory = hunspell_directory.AppendASCII("dictionaries");
   return hunspell_directory;
 }
 
+class SpellCheckTest : public testing::Test {
+ public:
+  SpellCheckTest() {
+    ReinitializeSpellCheck("en-US");
+  }
+
+  void ReinitializeSpellCheck(const std::string& language) {
+    spell_check_.reset(new SpellCheck());
+
+    FilePath hunspell_directory = GetHunspellDirectory();
+    EXPECT_FALSE(hunspell_directory.empty());
+    base::PlatformFile file = base::CreatePlatformFile(
+        SpellCheckCommon::GetVersionedFileName(language, hunspell_directory),
+        base::PLATFORM_FILE_OPEN | base::PLATFORM_FILE_READ, NULL);
+    spell_check_->Init(
+        file, std::vector<std::string>(), language);
+  }
+
+  virtual ~SpellCheckTest() {
+  }
+
+  SpellCheck* spell_check() { return spell_check_.get(); }
+
+ private:
+  scoped_ptr<SpellCheck> spell_check_;
+};
+
 // Operates unit tests for the webkit_glue::SpellCheckWord() function
 // with the US English dictionary.
 // The unit tests in this function consist of:
 //   * Tests for the function with empty strings;
 //   * Tests for the function with a valid English word;
 //   * Tests for the function with a valid non-English word;
 //   * Tests for the function with a valid English word with a preceding
 //     space character;
 //   * Tests for the function with a valid English word with a preceding
 //     non-English word;
@@ skipping 207 matching lines @@
     // [ROBUSTNESS] Two invalid English words concatenated with a contraction
     // character.
     {L"ifmmp:ifmmp", false, 0, 11},
 
     // [REGRESSION] Issue 13432: "Any word of 13 or 14 characters is not
     // spellcheck" <http://crbug.com/13432>.
     {L"qwertyuiopasd", false, 0, 13},
     {L"qwertyuiopasdf", false, 0, 14},
   };
 
-  FilePath hunspell_directory = GetHunspellDirectory();
-  ASSERT_FALSE(hunspell_directory.empty());
-
-  scoped_refptr<SpellChecker> spell_checker(new SpellChecker(
-      hunspell_directory, "en-US", NULL, FilePath()));
-  spell_checker->Initialize();
-  message_loop_.RunAllPending();
-
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kTestCases); ++i) {
     size_t input_length = 0;
     if (kTestCases[i].input != NULL) {
       input_length = wcslen(kTestCases[i].input);
     }
     int misspelling_start;
     int misspelling_length;
-    bool result = spell_checker->SpellCheckWord(
+    bool result = spell_check()->SpellCheckWord(
         WideToUTF16(kTestCases[i].input).c_str(),
         static_cast<int>(input_length),
         0,
         &misspelling_start,
         &misspelling_length, NULL);
 
     EXPECT_EQ(kTestCases[i].expected_result, result);
     EXPECT_EQ(kTestCases[i].misspelling_start, misspelling_start);
     EXPECT_EQ(kTestCases[i].misspelling_length, misspelling_length);
   }
 }
 
 TEST_F(SpellCheckTest, SpellCheckSuggestions_EN_US) {
   static const struct {
     // A string to be tested.
     const wchar_t* input;
     // An expected result for this test case.
     //   * true: the input string does not have any invalid words.
     //   * false: the input string has one or more invalid words.
     bool expected_result;
     // The position and the length of the first invalid word.
     int misspelling_start;
     int misspelling_length;
 
     // A suggested word that should occur.
     const wchar_t* suggested_word;
-  } kTestCases[] = {    // A valid English word with a preceding whitespace
-    // We need to have separate test cases here, since hunspell and the OS X
-    // spellchecking service occasionally differ on what they consider a valid
-    // suggestion for a given word, although these lists could likely be
-    // integrated somewhat.
-#if defined(OS_MACOSX)
-    // These words come from the wikipedia page of the most commonly
-    // misspelled words in english.
-    // (http://en.wikipedia.org/wiki/Commonly_misspelled_words).
-    {L"absense", false, 0, 0, L"absence"},
-    {L"acceptible", false, 0, 0, L"acceptable"},
-    {L"accidentaly", false, 0, 0, L"accidentally"},
-    {L"accomodate", false, 0, 0, L"accommodate"},
-    {L"acheive", false, 0, 0, L"achieve"},
-    {L"acknowlege", false, 0, 0, L"acknowledge"},
-    {L"acquaintence", false, 0, 0, L"acquaintance"},
-    {L"aquire", false, 0, 0, L"acquire"},
-    {L"aquit", false, 0, 0, L"acquit"},
-    {L"acrage", false, 0, 0, L"acreage"},
-    {L"adress", false, 0, 0, L"address"},
-    {L"adultary", false, 0, 0, L"adultery"},
-    {L"advertize", false, 0, 0, L"advertise"},
-    {L"adviseable", false, 0, 0, L"advisable"},
-    {L"agression", false, 0, 0, L"aggression"},
-    {L"alchohol", false, 0, 0, L"alcohol"},
-    {L"alege", false, 0, 0, L"allege"},
-    {L"allegaince", false, 0, 0, L"allegiance"},
-    {L"allmost", false, 0, 0, L"almost"},
-    // Ideally, this test should pass. It works in firefox, but not in hunspell
-    // or OS X.
-    // {L"alot", false, 0, 0, L"a lot"},
-    {L"amatuer", false, 0, 0, L"amateur"},
-    {L"ammend", false, 0, 0, L"amend"},
-    {L"amung", false, 0, 0, L"among"},
-    {L"anually", false, 0, 0, L"annually"},
-    {L"apparant", false, 0, 0, L"apparent"},
-    {L"artic", false, 0, 0, L"arctic"},
-    {L"arguement", false, 0, 0, L"argument"},
-    {L"athiest", false, 0, 0, L"atheist"},
-    {L"athelete", false, 0, 0, L"athlete"},
-    {L"avrage", false, 0, 0, L"average"},
-    {L"awfull", false, 0, 0, L"awful"},
-    {L"ballance", false, 0, 0, L"balance"},
-    {L"basicly", false, 0, 0, L"basically"},
-    {L"becuase", false, 0, 0, L"because"},
-    {L"becomeing", false, 0, 0, L"becoming"},
-    {L"befor", false, 0, 0, L"before"},
-    {L"begining", false, 0, 0, L"beginning"},
-    {L"beleive", false, 0, 0, L"believe"},
-    {L"bellweather", false, 0, 0, L"bellwether"},
-    {L"benifit", false, 0, 0, L"benefit"},
-    {L"bouy", false, 0, 0, L"buoy"},
-    {L"briliant", false, 0, 0, L"brilliant"},
-    {L"burgler", false, 0, 0, L"burglar"},
-    {L"camoflage", false, 0, 0, L"camouflage"},
-    {L"carrer", false, 0, 0, L"career"},
-    {L"carefull", false, 0, 0, L"careful"},
-    {L"Carribean", false, 0, 0, L"Caribbean"},
-    {L"catagory", false, 0, 0, L"category"},
-    {L"cauhgt", false, 0, 0, L"caught"},
-    {L"cieling", false, 0, 0, L"ceiling"},
-    {L"cemetary", false, 0, 0, L"cemetery"},
-    {L"certin", false, 0, 0, L"certain"},
-    {L"changable", false, 0, 0, L"changeable"},
-    {L"cheif", false, 0, 0, L"chief"},
-    {L"citezen", false, 0, 0, L"citizen"},
-    {L"collaegue", false, 0, 0, L"colleague"},
-    {L"colum", false, 0, 0, L"column"},
-    {L"comming", false, 0, 0, L"coming"},
-    {L"commited", false, 0, 0, L"committed"},
-    {L"compitition", false, 0, 0, L"competition"},
-    {L"conceed", false, 0, 0, L"concede"},
-    {L"congradulate", false, 0, 0, L"congratulate"},
-    {L"consciencious", false, 0, 0, L"conscientious"},
-    {L"concious", false, 0, 0, L"conscious"},
-    {L"concensus", false, 0, 0, L"consensus"},
-    {L"contraversy", false, 0, 0, L"controversy"},
-    {L"conveniance", false, 0, 0, L"convenience"},
-    {L"critecize", false, 0, 0, L"criticize"},
-    {L"dacquiri", false, 0, 0, L"daiquiri"},
-    {L"decieve", false, 0, 0, L"deceive"},
-    {L"dicide", false, 0, 0, L"decide"},
-    {L"definate", false, 0, 0, L"definite"},
-    {L"definitly", false, 0, 0, L"definitely"},
-    {L"deposite", false, 0, 0, L"deposit"},
-    {L"desparate", false, 0, 0, L"desperate"},
-    {L"develope", false, 0, 0, L"develop"},
-    {L"diffrence", false, 0, 0, L"difference"},
-    {L"dilema", false, 0, 0, L"dilemma"},
-    {L"disapear", false, 0, 0, L"disappear"},
-    {L"disapoint", false, 0, 0, L"disappoint"},
-    {L"disasterous", false, 0, 0, L"disastrous"},
-    {L"disipline", false, 0, 0, L"discipline"},
-    {L"drunkeness", false, 0, 0, L"drunkenness"},
-    {L"dumbell", false, 0, 0, L"dumbbell"},
-    {L"durring", false, 0, 0, L"during"},
-    {L"easely", false, 0, 0, L"easily"},
-    {L"eigth", false, 0, 0, L"eight"},
-    {L"embarass", false, 0, 0, L"embarrass"},
-    {L"enviroment", false, 0, 0, L"environment"},
-    {L"equiped", false, 0, 0, L"equipped"},
-    {L"equiptment", false, 0, 0, L"equipment"},
-    {L"exagerate", false, 0, 0, L"exaggerate"},
-    {L"excede", false, 0, 0, L"exceed"},
-    {L"exellent", false, 0, 0, L"excellent"},
-    {L"exsept", false, 0, 0, L"except"},
-    {L"exercize", false, 0, 0, L"exercise"},
-    {L"exilerate", false, 0, 0, L"exhilarate"},
-    {L"existance", false, 0, 0, L"existence"},
-    {L"experiance", false, 0, 0, L"experience"},
-    {L"experament", false, 0, 0, L"experiment"},
-    {L"explaination", false, 0, 0, L"explanation"},
-    {L"extreem", false, 0, 0, L"extreme"},
-    {L"familier", false, 0, 0, L"familiar"},
-    {L"facinating", false, 0, 0, L"fascinating"},
-    {L"firey", false, 0, 0, L"fiery"},
-    {L"finaly", false, 0, 0, L"finally"},
-    {L"flourescent", false, 0, 0, L"fluorescent"},
-    {L"foriegn", false, 0, 0, L"foreign"},
-    {L"fourty", false, 0, 0, L"forty"},
-    {L"foreward", false, 0, 0, L"forward"},
-    {L"freind", false, 0, 0, L"friend"},
-    {L"fullfil", false, 0, 0, L"fulfill"},
-    {L"fundemental", false, 0, 0, L"fundamental"},
-    {L"guage", false, 0, 0, L"gauge"},
-    {L"generaly", false, 0, 0, L"generally"},
-    {L"goverment", false, 0, 0, L"government"},
-    {L"grammer", false, 0, 0, L"grammar"},
-    {L"gratefull", false, 0, 0, L"grateful"},
-    {L"garantee", false, 0, 0, L"guarantee"},
-    {L"guidence", false, 0, 0, L"guidance"},
-    {L"happyness", false, 0, 0, L"happiness"},
-    {L"harrass", false, 0, 0, L"harass"},
-    {L"heighth", false, 0, 0, L"height"},
-    {L"heirarchy", false, 0, 0, L"hierarchy"},
-    {L"humerous", false, 0, 0, L"humorous"},
-    {L"hygene", false, 0, 0, L"hygiene"},
-    {L"hipocrit", false, 0, 0, L"hypocrite"},
-    {L"idenity", false, 0, 0, L"identity"},
-    {L"ignorence", false, 0, 0, L"ignorance"},
-    {L"imaginery", false, 0, 0, L"imaginary"},
-    {L"immitate", false, 0, 0, L"imitate"},
-    {L"immitation", false, 0, 0, L"imitation"},
-    {L"imediately", false, 0, 0, L"immediately"},
-    {L"incidently", false, 0, 0, L"incidentally"},
-    {L"independant", false, 0, 0, L"independent"},
-    {L"indispensible", false, 0, 0, L"indispensable"},
-    {L"innoculate", false, 0, 0, L"inoculate"},
-    {L"inteligence", false, 0, 0, L"intelligence"},
-    {L"intresting", false, 0, 0, L"interesting"},
-    {L"interuption", false, 0, 0, L"interruption"},
-    {L"irrelevent", false, 0, 0, L"irrelevant"},
-    {L"irritible", false, 0, 0, L"irritable"},
-    {L"iland", false, 0, 0, L"island"},
-    {L"jellous", false, 0, 0, L"jealous"},
-    {L"knowlege", false, 0, 0, L"knowledge"},
-    {L"labratory", false, 0, 0, L"laboratory"},
-    {L"liesure", false, 0, 0, L"leisure"},
-    {L"lenght", false, 0, 0, L"length"},
-    {L"liason", false, 0, 0, L"liaison"},
-    {L"libary", false, 0, 0, L"library"},
-    {L"lisence", false, 0, 0, L"license"},
-    {L"lonelyness", false, 0, 0, L"loneliness"},
-    {L"lieing", false, 0, 0, L"lying"},
-    {L"maintenence", false, 0, 0, L"maintenance"},
-    {L"manuever", false, 0, 0, L"maneuver"},
-    {L"marrige", false, 0, 0, L"marriage"},
-    {L"mathmatics", false, 0, 0, L"mathematics"},
-    {L"medcine", false, 0, 0, L"medicine"},
-    {L"medeval", false, 0, 0, L"medieval"},
-    {L"momento", false, 0, 0, L"memento"},
-    {L"millenium", false, 0, 0, L"millennium"},
-    {L"miniture", false, 0, 0, L"miniature"},
-    {L"minite", false, 0, 0, L"minute"},
-    {L"mischevous", false, 0, 0, L"mischievous"},
-    {L"mispell", false, 0, 0, L"misspell"},
-    // Maybe this one should pass, as it works in hunspell, but not in firefox.
-    // {L"misterius", false, 0, 0, L"mysterious"},
-    {L"naturaly", false, 0, 0, L"naturally"},
-    {L"neccessary", false, 0, 0, L"necessary"},
-    {L"neice", false, 0, 0, L"niece"},
-    {L"nieghbor", false, 0, 0, L"neighbor"},
-    {L"nieghbour", false, 0, 0, L"neighbor"},
-    {L"niether", false, 0, 0, L"neither"},
-    {L"noticable", false, 0, 0, L"noticeable"},
-    {L"occassion", false, 0, 0, L"occasion"},
-    {L"occasionaly", false, 0, 0, L"occasionally"},
-    {L"occurrance", false, 0, 0, L"occurrence"},
-    {L"occured", false, 0, 0, L"occurred"},
-    {L"oficial", false, 0, 0, L"official"},
-    {L"offen", false, 0, 0, L"often"},
-    {L"ommision", false, 0, 0, L"omission"},
-    {L"oprate", false, 0, 0, L"operate"},
-    {L"oppurtunity", false, 0, 0, L"opportunity"},
-    {L"orignal", false, 0, 0, L"original"},
-    {L"outragous", false, 0, 0, L"outrageous"},
-    {L"parrallel", false, 0, 0, L"parallel"},
-    {L"parliment", false, 0, 0, L"parliament"},
-    {L"particurly", false, 0, 0, L"particularly"},
-    {L"passtime", false, 0, 0, L"pastime"},
-    {L"peculier", false, 0, 0, L"peculiar"},
-    {L"percieve", false, 0, 0, L"perceive"},
-    {L"pernament", false, 0, 0, L"permanent"},
-    {L"perseverence", false, 0, 0, L"perseverance"},
-    {L"personaly", false, 0, 0, L"personally"},
-    {L"personell", false, 0, 0, L"personnel"},
-    {L"persaude", false, 0, 0, L"persuade"},
-    {L"pichure", false, 0, 0, L"picture"},
-    {L"peice", false, 0, 0, L"piece"},
-    {L"plagerize", false, 0, 0, L"plagiarize"},
-    {L"playright", false, 0, 0, L"playwright"},
-    {L"plesant", false, 0, 0, L"pleasant"},
-    {L"pollitical", false, 0, 0, L"political"},
-    {L"posession", false, 0, 0, L"possession"},
-    {L"potatos", false, 0, 0, L"potatoes"},
-    {L"practicle", false, 0, 0, L"practical"},
-    {L"preceed", false, 0, 0, L"precede"},
-    {L"predjudice", false, 0, 0, L"prejudice"},
-    {L"presance", false, 0, 0, L"presence"},
-    {L"privelege", false, 0, 0, L"privilege"},
-    // This one should probably work. It does in FF and Hunspell.
-    // {L"probly", false, 0, 0, L"probably"},
-    {L"proffesional", false, 0, 0, L"professional"},
-    {L"professer", false, 0, 0, L"professor"},
-    {L"promiss", false, 0, 0, L"promise"},
-    {L"pronounciation", false, 0, 0, L"pronunciation"},
-    {L"prufe", false, 0, 0, L"proof"},
-    {L"psycology", false, 0, 0, L"psychology"},
-    {L"publically", false, 0, 0, L"publicly"},
-    {L"quanity", false, 0, 0, L"quantity"},
-    {L"quarentine", false, 0, 0, L"quarantine"},
-    {L"questionaire", false, 0, 0, L"questionnaire"},
-    {L"readible", false, 0, 0, L"readable"},
-    {L"realy", false, 0, 0, L"really"},
-    {L"recieve", false, 0, 0, L"receive"},
-    {L"reciept", false, 0, 0, L"receipt"},
-    {L"reconize", false, 0, 0, L"recognize"},
-    {L"recomend", false, 0, 0, L"recommend"},
-    {L"refered", false, 0, 0, L"referred"},
-    {L"referance", false, 0, 0, L"reference"},
-    {L"relevent", false, 0, 0, L"relevant"},
-    {L"religous", false, 0, 0, L"religious"},
-    {L"repitition", false, 0, 0, L"repetition"},
-    {L"restarant", false, 0, 0, L"restaurant"},
-    {L"rythm", false, 0, 0, L"rhythm"},
-    {L"rediculous", false, 0, 0, L"ridiculous"},
-    {L"sacrefice", false, 0, 0, L"sacrifice"},
-    {L"saftey", false, 0, 0, L"safety"},
-    {L"sissors", false, 0, 0, L"scissors"},
-    {L"secratary", false, 0, 0, L"secretary"},
-    {L"sieze", false, 0, 0, L"seize"},
-    {L"seperate", false, 0, 0, L"separate"},
-    {L"sargent", false, 0, 0, L"sergeant"},
-    {L"shineing", false, 0, 0, L"shining"},
-    {L"similer", false, 0, 0, L"similar"},
-    {L"sinceerly", false, 0, 0, L"sincerely"},
-    {L"speach", false, 0, 0, L"speech"},
-    {L"stoping", false, 0, 0, L"stopping"},
-    {L"strenght", false, 0, 0, L"strength"},
-    {L"succede", false, 0, 0, L"succeed"},
-    {L"succesful", false, 0, 0, L"successful"},
-    {L"supercede", false, 0, 0, L"supersede"},
-    {L"surelly", false, 0, 0, L"surely"},
-    {L"suprise", false, 0, 0, L"surprise"},
-    {L"temperture", false, 0, 0, L"temperature"},
-    {L"temprary", false, 0, 0, L"temporary"},
-    {L"tomatos", false, 0, 0, L"tomatoes"},
-    {L"tommorrow", false, 0, 0, L"tomorrow"},
-    {L"tounge", false, 0, 0, L"tongue"},
-    {L"truely", false, 0, 0, L"truly"},
-    {L"twelth", false, 0, 0, L"twelfth"},
-    {L"tyrany", false, 0, 0, L"tyranny"},
-    {L"underate", false, 0, 0, L"underrate"},
-    {L"untill", false, 0, 0, L"until"},
-    {L"unuseual", false, 0, 0, L"unusual"},
-    {L"upholstry", false, 0, 0, L"upholstery"},
-    {L"usible", false, 0, 0, L"usable"},
-    {L"useing", false, 0, 0, L"using"},
-    {L"usualy", false, 0, 0, L"usually"},
-    {L"vaccuum", false, 0, 0, L"vacuum"},
-    {L"vegatarian", false, 0, 0, L"vegetarian"},
-    {L"vehical", false, 0, 0, L"vehicle"},
-    {L"visious", false, 0, 0, L"vicious"},
-    {L"villege", false, 0, 0, L"village"},
-    {L"wierd", false, 0, 0, L"weird"},
-    {L"wellcome", false, 0, 0, L"welcome"},
-    {L"wellfare", false, 0, 0, L"welfare"},
-    {L"wilfull", false, 0, 0, L"willful"},
-    {L"withold", false, 0, 0, L"withhold"},
-    {L"writting", false, 0, 0, L"writing"},
-#else
+  } kTestCases[] = {
     {L"ello", false, 0, 0, L"hello"},
     {L"ello", false, 0, 0, L"cello"},
     {L"wate", false, 0, 0, L"water"},
     {L"wate", false, 0, 0, L"waste"},
     {L"wate", false, 0, 0, L"sate"},
     {L"wate", false, 0, 0, L"ate"},
     {L"jum", false, 0, 0, L"jump"},
     {L"jum", false, 0, 0, L"hum"},
     {L"jum", false, 0, 0, L"sum"},
     {L"jum", false, 0, 0, L"um"},
-#endif  // !OS_MACOSX
     // TODO (Sidchat): add many more examples.
   };
 
-  FilePath hunspell_directory = GetHunspellDirectory();
-  ASSERT_FALSE(hunspell_directory.empty());
-
-  scoped_refptr<SpellChecker> spell_checker(new SpellChecker(
-      hunspell_directory, "en-US", NULL, FilePath()));
-  spell_checker->Initialize();
-  message_loop_.RunAllPending();
-
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kTestCases); ++i) {
     std::vector<string16> suggestions;
     size_t input_length = 0;
     if (kTestCases[i].input != NULL) {
       input_length = wcslen(kTestCases[i].input);
     }
     int misspelling_start;
     int misspelling_length;
-    bool result = spell_checker->SpellCheckWord(
+    bool result = spell_check()->SpellCheckWord(
         WideToUTF16(kTestCases[i].input).c_str(),
         static_cast<int>(input_length),
         0,
         &misspelling_start,
         &misspelling_length,
         &suggestions);
 
     // Check for spelling.
     EXPECT_EQ(kTestCases[i].expected_result, result);
 
@@ skipping 237 matching lines @@
       // Vietnamese
       "vi-VN",
       L"Nhi\x1EC7m v\x1EE5 c\x1EE7\x0061 "
       L"Google la \x0111\x1EC3 t\x1ED5 ch\x1EE9\x0063 "
       L"c\x00E1\x0063 th\x00F4ng tin c\x1EE7\x0061 "
       L"th\x1EBF gi\x1EDBi va l\x00E0m cho n\x00F3 universal c\x00F3 "
       L"th\x1EC3 truy c\x1EADp va h\x1EEFu d\x1EE5ng h\x01A1n."
     },
   };
 
-  FilePath hunspell_directory = GetHunspellDirectory();
-  ASSERT_FALSE(hunspell_directory.empty());
-
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kTestCases); ++i) {
-    scoped_refptr<SpellChecker> spell_checker(new SpellChecker(
-        hunspell_directory, kTestCases[i].language, NULL, FilePath()));
-    spell_checker->Initialize();
-    message_loop_.RunAllPending();
-
+    ReinitializeSpellCheck(kTestCases[i].language);
     size_t input_length = 0;
     if (kTestCases[i].input != NULL)
       input_length = wcslen(kTestCases[i].input);
 
     int misspelling_start = 0;
     int misspelling_length = 0;
-    bool result = spell_checker->SpellCheckWord(
+    bool result = spell_check()->SpellCheckWord(
         WideToUTF16(kTestCases[i].input).c_str(),
         static_cast<int>(input_length),
         0,
         &misspelling_start,
         &misspelling_length, NULL);
 
     EXPECT_EQ(true, result) << kTestCases[i].language;
     EXPECT_EQ(0, misspelling_start);
     EXPECT_EQ(0, misspelling_length);
   }
 }
 
-// This test Adds words to the SpellChecker and veifies that it remembers them.
-TEST_F(SpellCheckTest, DISABLED_SpellCheckAddToDictionary_EN_US) {
-  static const struct {
-    // A string to be added to SpellChecker.
-    const wchar_t* word_to_add;
-  } kTestCases[] = {  // Words to be added to the SpellChecker.
-    {L"Googley"},
-    {L"Googleplex"},
-    {L"Googler"},
-  };
-
-  FilePath custom_dictionary_file(kTempCustomDictionaryFile);
-  FilePath hunspell_directory = GetHunspellDirectory();
-  ASSERT_FALSE(hunspell_directory.empty());
-
-  scoped_refptr<SpellChecker> spell_checker(new SpellChecker(
-      hunspell_directory, "en-US", NULL, custom_dictionary_file));
-  spell_checker->Initialize();
-  message_loop_.RunAllPending();
-
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kTestCases); ++i) {
-    // Add the word to spellchecker.
-    spell_checker->AddWord(WideToUTF16(kTestCases[i].word_to_add));
-
-    // Now check whether it is added to Spellchecker.
-    std::vector<string16> suggestions;
-    size_t input_length = 0;
-    if (kTestCases[i].word_to_add != NULL) {
-      input_length = wcslen(kTestCases[i].word_to_add);
-    }
-    int misspelling_start;
-    int misspelling_length;
-    bool result = spell_checker->SpellCheckWord(
-        WideToUTF16(kTestCases[i].word_to_add).c_str(),
-        static_cast<int>(input_length),
-        0,
-        &misspelling_start,
-        &misspelling_length,
-        &suggestions);
-
-    // Check for spelling.
-    EXPECT_TRUE(result);
-  }
-
-  // Now initialize another spellchecker to see that AddToWord is permanent.
-  scoped_refptr<SpellChecker> spell_checker_new(new SpellChecker(
-      hunspell_directory, "en-US", NULL, custom_dictionary_file));
-  spell_checker->Initialize();
-  message_loop_.RunAllPending();
-
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kTestCases); ++i) {
-    // Now check whether it is added to Spellchecker.
-    std::vector<string16> suggestions;
-    size_t input_length = 0;
-    if (kTestCases[i].word_to_add != NULL) {
-      input_length = wcslen(kTestCases[i].word_to_add);
-    }
-    int misspelling_start;
-    int misspelling_length;
-    bool result = spell_checker_new->SpellCheckWord(
-        WideToUTF16(kTestCases[i].word_to_add).c_str(),
-        static_cast<int>(input_length),
-        0,
-        &misspelling_start,
-        &misspelling_length,
-        &suggestions);
-
-    // Check for spelling.
-    EXPECT_TRUE(result);
-  }
-
-  // Remove the temp custom dictionary file.
-  file_util::Delete(custom_dictionary_file, false);
-}
-
-// SpellChecker should suggest custome words for misspelled words.
-TEST_F(SpellCheckTest, DISABLED_SpellCheckSuggestionsAddToDictionary_EN_US) {
-  static const struct {
-    // A string to be added to SpellChecker.
-    const wchar_t* word_to_add;
-  } kTestCases[] = {  // word to be added to SpellChecker
-    {L"Googley"},
-    {L"Googleplex"},
-    {L"Googler"},
-  };
-
-  FilePath custom_dictionary_file(kTempCustomDictionaryFile);
-  FilePath hunspell_directory = GetHunspellDirectory();
-  ASSERT_FALSE(hunspell_directory.empty());
-
-  scoped_refptr<SpellChecker> spell_checker(new SpellChecker(
-      hunspell_directory, "en-US", NULL, custom_dictionary_file));
-  spell_checker->Initialize();
-  message_loop_.RunAllPending();
-
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kTestCases); ++i) {
-    // Add the word to spellchecker.
-    spell_checker->AddWord(WideToUTF16(kTestCases[i].word_to_add));
-  }
-
-  // Now check to see whether the custom words are suggested for
-  // misspelled but similar words.
-  static const struct {
-    // A string to be tested.
-    const wchar_t* input;
-    // An expected result for this test case.
-    //   * true: the input string does not have any invalid words.
-    //   * false: the input string has one or more invalid words.
-    bool expected_result;
-    // The position and the length of the first invalid word.
-    int misspelling_start;
-    int misspelling_length;
-
-    // A suggested word that should occur.
-    const wchar_t* suggested_word;
-  } kTestCasesToBeTested[] = {
-    {L"oogley", false, 0, 0, L"Googley"},
-    {L"oogler", false, 0, 0, L"Googler"},
-    {L"oogleplex", false, 0, 0, L"Googleplex"},
-  };
-
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kTestCasesToBeTested); ++i) {
-    std::vector<string16> suggestions;
-    size_t input_length = 0;
-    if (kTestCasesToBeTested[i].input != NULL) {
-      input_length = wcslen(kTestCasesToBeTested[i].input);
-    }
-    int misspelling_start;
-    int misspelling_length;
-    bool result = spell_checker->SpellCheckWord(
-        WideToUTF16(kTestCasesToBeTested[i].input).c_str(),
-        static_cast<int>(input_length),
-        0,
-        &misspelling_start,
-        &misspelling_length,
-        &suggestions);
-
-    // Check for spelling.
-    EXPECT_EQ(result, kTestCasesToBeTested[i].expected_result);
-
-    // Check if the suggested words occur.
-    bool suggested_word_is_present = false;
-    for (int j=0; j < static_cast<int>(suggestions.size()); j++) {
-      if (suggestions.at(j).compare(
-              WideToUTF16(kTestCasesToBeTested[i].suggested_word)) ==
-              0) {
-        suggested_word_is_present = true;
-        break;
-      }
-    }
-
-    EXPECT_TRUE(suggested_word_is_present);
-  }
-
-  // Remove the temp custom dictionary file.
-  file_util::Delete(custom_dictionary_file, false);
-}
-
 TEST_F(SpellCheckTest, GetAutoCorrectionWord_EN_US) {
   static const struct {
     // A misspelled word.
     const char* input;
 
     // An expected result for this test case.
     // Should be an empty string if there are no suggestions for auto correct.
     const char* expected_result;
   } kTestCases[] = {
     {"teh", "the"},
     {"moer", "more"},
     {"watre", "water"},
     {"noen", ""},
     {"what", ""},
   };
-
-  FilePath hunspell_directory = GetHunspellDirectory();
-  ASSERT_FALSE(hunspell_directory.empty());
-
-  scoped_refptr<SpellChecker> spell_checker(new SpellChecker(
-      hunspell_directory, "en-US", NULL, FilePath()));
-  spell_checker->EnableAutoSpellCorrect(true);
-  spell_checker->Initialize();
-  message_loop_.RunAllPending();
+  spell_check()->EnableAutoSpellCorrect(true);
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kTestCases); ++i) {
     string16 misspelled_word(UTF8ToUTF16(kTestCases[i].input));
     string16 expected_autocorrect_word(
         UTF8ToUTF16(kTestCases[i].expected_result));
-    string16 autocorrect_word = spell_checker->GetAutoCorrectionWord(
+    string16 autocorrect_word = spell_check()->GetAutoCorrectionWord(
         misspelled_word, 0);
 
     // Check for spelling.
     EXPECT_EQ(expected_autocorrect_word, autocorrect_word);
   }
 }
 
-#if defined(OS_MACOSX)
-// Tests that words are properly ignored. Currently only enabled on OS X as it
-// is the only platform to support ignoring words. Note that in this test, we
-// supply a non-zero doc_tag, in order to test that ignored words are matched to
-// the correct document.
-TEST_F(SpellCheckTest, IgnoreWords_EN_US) {
-  static const struct {
-    // A misspelled word.
-    const char* input;
-    bool input_result;
-  } kTestCases[] = {
-    {"teh", false},
-    {"moer", false},
-    {"watre", false},
-    {"noen", false},
-  };
-
-  FilePath hunspell_directory = GetHunspellDirectory();
-  ASSERT_FALSE(hunspell_directory.empty());
-
-  scoped_refptr<SpellChecker> spell_checker(new SpellChecker(
-      hunspell_directory, "en-US", NULL, FilePath()));
-  spell_checker->Initialize();
-  message_loop_.RunAllPending();
-
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kTestCases); ++i) {
-    string16 word(UTF8ToUTF16(kTestCases[i].input));
-    std::vector<string16> suggestions;
-    size_t input_length = 0;
-    if (kTestCases[i].input != NULL) {
-      input_length = word.length();
-    }
-    int misspelling_start;
-    int misspelling_length;
-
-    int doc_tag = SpellCheckerPlatform::GetDocumentTag();
-    bool result = spell_checker->SpellCheckWord(word.c_str(),
-                                                static_cast<int>(input_length),
-                                                doc_tag,
-                                                &misspelling_start,
-                                                &misspelling_length,
-                                                &suggestions);
-
-    // The word should show up as misspelled.
-    EXPECT_EQ(kTestCases[i].input_result, result);
-
-    // Ignore the word.
-    SpellCheckerPlatform::IgnoreWord(word);
-
-    // Spellcheck again.
-    result = spell_checker->SpellCheckWord(word.c_str(),
-                                           static_cast<int>(input_length),
-                                           doc_tag,
-                                           &misspelling_start,
-                                           &misspelling_length,
-                                           &suggestions);
-
-    // The word should now show up as correctly spelled.
-    EXPECT_EQ(!(kTestCases[i].input_result), result);
-
-    // Close the docuemnt. Any words that we had previously ignored should no
-    // longer be ignored and thus should show up as misspelled.
-    SpellCheckerPlatform::CloseDocumentWithTag(doc_tag);
-
-    // Spellcheck one more time.
-    result = spell_checker->SpellCheckWord(word.c_str(),
-                                           static_cast<int>(input_length),
-                                           doc_tag,
-                                           &misspelling_start,
-                                           &misspelling_length,
-                                           &suggestions);
-
-    // The word should now show be spelled wrong again
-    EXPECT_EQ(kTestCases[i].input_result, result);
-  }
-} // Test IgnoreWords_EN_US
-#endif // OS_MACOSX
+}  // namespace