Revert r72606, except for the DEPS roll. It's redding the tree.

BUG=5509
TEST=waterfall

Review URL: http://codereview.chromium.org/6388005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72609 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 13 insertions, 7 deletions

diff --git a/chrome/common/spellcheck_common.cc b/chrome/common/spellcheck_common.cc
index 31572de..c52dcba 100644
--- a/chrome/common/spellcheck_common.cc
+++ b/chrome/common/spellcheck_common.cc
@@ -73,6 +73,9 @@ FilePath GetVersionedFileName(const std::string& input_language,
   // with additional words found by the translation team.
   static const char kDefaultVersionString[] = "-1-2";
 
+  // The following dictionaries have either not been augmented with additional
+  // words (version 1-1) or have new words, as well as an upgraded dictionary
+  // as of Feb 2009 (version 1-3).
   static const struct {
     // The language input.
     const char* language;
@@ -80,7 +83,9 @@ FilePath GetVersionedFileName(const std::string& input_language,
     // The corresponding version.
     const char* version;
   } special_version_string[] = {
-    {"es-ES", "-1-1"}, // 1-1: Have not been augmented with addtional words.
+    {"en-AU", "-1-1"},
+    {"en-GB", "-1-1"},
+    {"es-ES", "-1-1"},
     {"nl-NL", "-1-1"},
     {"sv-SE", "-1-1"},
     {"he-IL", "-1-1"},
@@ -88,15 +93,14 @@ FilePath GetVersionedFileName(const std::string& input_language,
     {"hi-IN", "-1-1"},
     {"tr-TR", "-1-1"},
     {"et-EE", "-1-1"},
-    {"lt-LT", "-1-3"}, // 1-3 (Feb 2009): new words, as well as an upgraded
-                       // dictionary.
+    {"fr-FR", "-2-0"}, // Hunspell fr(modern) 3.7 + Chromium delta.
+    {"lt-LT", "-1-3"},
     {"pl-PL", "-1-3"},
-    {"fr-FR", "-2-0"}, // 2-0 (2010): upgraded dictionaries.
     {"hu-HU", "-2-0"},
     {"ro-RO", "-2-0"},
     {"ru-RU", "-2-0"},
     {"bg-BG", "-2-0"},
-    {"sr",    "-2-0"},
+    {"sr", "-2-0"},
     {"uk-UA", "-2-0"},
   };
 
diff --git a/chrome/renderer/spellchecker/spellcheck_unittest.cc b/chrome/renderer/spellchecker/spellcheck_unittest.cc
index 8d47b6e..1e3b38b 100644
--- a/chrome/renderer/spellchecker/spellcheck_unittest.cc
+++ b/chrome/renderer/spellchecker/spellcheck_unittest.cc
@@ -411,12 +411,14 @@ TEST_F(SpellCheckTest, SpellCheckText) {
     }, {
       // English (Australia)
       "en-AU",
-      L"Google's mission is to organise the world's information and make it "
+      // L"Google's " - to be added.
+      L"mission is to organise the world's information and make it "
       L"universally accessible and useful."
     }, {
       // English (United Kingdom)
       "en-GB",
-      L"Google's mission is to organise the world's information and make it "
+      // L"Google's " - to be added.
+      L"mission is to organise the world's information and make it "
       L"universally accessible and useful."
     }, {
       // English (United States)