bump hunspell dictionary version numbers for en-RR locales

see http://codereview.chromium.org/10388240/

BUG=95834, 77708, 128896
TEST=none

Review URL: https://chromiumcodereview.appspot.com/10411080

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

3 files changed, 54 insertions, 47 deletions

diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index dfcc806..a307906 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1934,7 +1934,7 @@
         'renderer/net/predictor_queue_unittest.cc',
         'renderer/net/renderer_predictor_unittest.cc',
         'renderer/plugins/plugin_uma_unittest.cc',
-	'renderer/prerender/prerender_dispatcher_unittest.cc',
+        'renderer/prerender/prerender_dispatcher_unittest.cc',
         'renderer/safe_browsing/features_unittest.cc',
         'renderer/safe_browsing/murmurhash3_util_unittest.cc',
         'renderer/safe_browsing/phishing_term_feature_extractor_unittest.cc',
diff --git a/chrome/common/spellcheck_common.cc b/chrome/common/spellcheck_common.cc
index 26d90ce..827784b 100644
--- a/chrome/common/spellcheck_common.cc
+++ b/chrome/common/spellcheck_common.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -100,10 +100,12 @@ FilePath GetVersionedFileName(const std::string& input_language,
     {"bg-BG", "-2-0"},
     {"sr",    "-2-0"},
     {"uk-UA", "-2-0"},
-    {"en-US", "-2-1"},  // 2-1 (Mar 2011): upgraded dictionaries.
-    {"en-CA", "-2-1"},
     {"pt-BR", "-2-2"},  // 2-2 (Mar 2011): upgraded a dictionary.
     {"sh",    "-2-2"},  // 2-2 (Mar 2011): added a dictionary.
+    {"en-US", "-2-3"},  // 2-3 (May 2012): fixed affixes + more words.
+    {"en-CA", "-2-3"},
+    {"en-GB", "-2-3"},
+    {"en-AU", "-2-3"},
   };
 
   // Generate the bdict file name using default version string or special
diff --git a/chrome/renderer/spellchecker/spellcheck_unittest.cc b/chrome/renderer/spellchecker/spellcheck_unittest.cc
index 7544d55..c0043b9 100644
--- a/chrome/renderer/spellchecker/spellcheck_unittest.cc
+++ b/chrome/renderer/spellchecker/spellcheck_unittest.cc
@@ -152,106 +152,106 @@ TEST_F(SpellCheckTest, SpellCheckStrings_EN_US) {
     int misspelling_length;
   } kTestCases[] = {
     // Empty strings.
-    {L"", true, 0, 0},
-    {L" ", true, 0, 0},
-    {L"\xA0", true, 0, 0},
-    {L"\x3000", true, 0, 0},
+    {L"", true},
+    {L" ", true},
+    {L"\xA0", true},
+    {L"\x3000", true},
 
     // A valid English word "hello".
-    {L"hello", true, 0, 0},
+    {L"hello", true},
     // A valid Chinese word (meaning "hello") consisiting of two CJKV
     // ideographs
-    {L"\x4F60\x597D", true, 0, 0},
+    {L"\x4F60\x597D", true},
     // A valid Korean word (meaning "hello") consisting of five hangul
     // syllables
-    {L"\xC548\xB155\xD558\xC138\xC694", true, 0, 0},
+    {L"\xC548\xB155\xD558\xC138\xC694", true},
     // A valid Japanese word (meaning "hello") consisting of five Hiragana
     // letters
-    {L"\x3053\x3093\x306B\x3061\x306F", true, 0, 0},
+    {L"\x3053\x3093\x306B\x3061\x306F", true},
     // A valid Hindi word (meaning ?) consisting of six Devanagari letters
     // (This word is copied from "http://b/issue?id=857583".)
-    {L"\x0930\x093E\x091C\x0927\x093E\x0928", true, 0, 0},
+    {L"\x0930\x093E\x091C\x0927\x093E\x0928", true},
     // A valid English word "affix" using a Latin ligature 'ffi'
-    {L"a\xFB03x", true, 0, 0},
+    {L"a\xFB03x", true},
     // A valid English word "hello" (fullwidth version)
-    {L"\xFF28\xFF45\xFF4C\xFF4C\xFF4F", true, 0, 0},
+    {L"\xFF28\xFF45\xFF4C\xFF4C\xFF4F", true},
     // Two valid Greek words (meaning "hello") consisting of seven Greek
     // letters
-    {L"\x03B3\x03B5\x03B9\x03AC" L" " L"\x03C3\x03BF\x03C5", true, 0, 0},
+    {L"\x03B3\x03B5\x03B9\x03AC" L" " L"\x03C3\x03BF\x03C5", true},
     // A valid Russian word (meainng "hello") consisting of twelve Cyrillic
     // letters
     {L"\x0437\x0434\x0440\x0430\x0432\x0441"
-     L"\x0442\x0432\x0443\x0439\x0442\x0435", true, 0, 0},
+     L"\x0442\x0432\x0443\x0439\x0442\x0435", true},
     // A valid English contraction
-    {L"isn't", true, 0, 0},
+    {L"isn't", true},
     // A valid English word enclosed with underscores.
-    {L"_hello_", true, 0, 0},
+    {L"_hello_", true},
 
     // A valid English word with a preceding whitespace
-    {L" " L"hello", true, 0, 0},
+    {L" " L"hello", true},
     // A valid English word with a preceding no-break space
-    {L"\xA0" L"hello", true, 0, 0},
+    {L"\xA0" L"hello", true},
     // A valid English word with a preceding ideographic space
-    {L"\x3000" L"hello", true, 0, 0},
+    {L"\x3000" L"hello", true},
     // A valid English word with a preceding Chinese word
-    {L"\x4F60\x597D" L"hello", true, 0, 0},
+    {L"\x4F60\x597D" L"hello", true},
     // [ROBUSTNESS] A valid English word with a preceding Korean word
-    {L"\xC548\xB155\xD558\xC138\xC694" L"hello", true, 0, 0},
+    {L"\xC548\xB155\xD558\xC138\xC694" L"hello", true},
     // A valid English word with a preceding Japanese word
-    {L"\x3053\x3093\x306B\x3061\x306F" L"hello", true, 0, 0},
+    {L"\x3053\x3093\x306B\x3061\x306F" L"hello", true},
     // [ROBUSTNESS] A valid English word with a preceding Hindi word
-    {L"\x0930\x093E\x091C\x0927\x093E\x0928" L"hello", true, 0, 0},
+    {L"\x0930\x093E\x091C\x0927\x093E\x0928" L"hello", true},
     // [ROBUSTNESS] A valid English word with two preceding Greek words
     {L"\x03B3\x03B5\x03B9\x03AC" L" " L"\x03C3\x03BF\x03C5"
-     L"hello", true, 0, 0},
+     L"hello", true},
     // [ROBUSTNESS] A valid English word with a preceding Russian word
     {L"\x0437\x0434\x0440\x0430\x0432\x0441"
-     L"\x0442\x0432\x0443\x0439\x0442\x0435" L"hello", true, 0, 0},
+     L"\x0442\x0432\x0443\x0439\x0442\x0435" L"hello", true},
 
     // A valid English word with a following whitespace
-    {L"hello" L" ", true, 0, 0},
+    {L"hello" L" ", true},
     // A valid English word with a following no-break space
-    {L"hello" L"\xA0", true, 0, 0},
+    {L"hello" L"\xA0", true},
     // A valid English word with a following ideographic space
-    {L"hello" L"\x3000", true, 0, 0},
+    {L"hello" L"\x3000", true},
     // A valid English word with a following Chinese word
-    {L"hello" L"\x4F60\x597D", true, 0, 0},
+    {L"hello" L"\x4F60\x597D", true},
     // [ROBUSTNESS] A valid English word with a following Korean word
-    {L"hello" L"\xC548\xB155\xD558\xC138\xC694", true, 0, 0},
+    {L"hello" L"\xC548\xB155\xD558\xC138\xC694", true},
     // A valid English word with a following Japanese word
-    {L"hello" L"\x3053\x3093\x306B\x3061\x306F", true, 0, 0},
+    {L"hello" L"\x3053\x3093\x306B\x3061\x306F", true},
     // [ROBUSTNESS] A valid English word with a following Hindi word
-    {L"hello" L"\x0930\x093E\x091C\x0927\x093E\x0928", true, 0, 0},
+    {L"hello" L"\x0930\x093E\x091C\x0927\x093E\x0928", true},
     // [ROBUSTNESS] A valid English word with two following Greek words
     {L"hello"
-     L"\x03B3\x03B5\x03B9\x03AC" L" " L"\x03C3\x03BF\x03C5", true, 0, 0},
+     L"\x03B3\x03B5\x03B9\x03AC" L" " L"\x03C3\x03BF\x03C5", true},
     // [ROBUSTNESS] A valid English word with a following Russian word
     {L"hello" L"\x0437\x0434\x0440\x0430\x0432\x0441"
-     L"\x0442\x0432\x0443\x0439\x0442\x0435", true, 0, 0},
+     L"\x0442\x0432\x0443\x0439\x0442\x0435", true},
 
     // Two valid English words concatenated with a whitespace
-    {L"hello" L" " L"hello", true, 0, 0},
+    {L"hello" L" " L"hello", true},
     // Two valid English words concatenated with a no-break space
-    {L"hello" L"\xA0" L"hello", true, 0, 0},
+    {L"hello" L"\xA0" L"hello", true},
     // Two valid English words concatenated with an ideographic space
-    {L"hello" L"\x3000" L"hello", true, 0, 0},
+    {L"hello" L"\x3000" L"hello", true},
     // Two valid English words concatenated with a Chinese word
-    {L"hello" L"\x4F60\x597D" L"hello", true, 0, 0},
+    {L"hello" L"\x4F60\x597D" L"hello", true},
     // [ROBUSTNESS] Two valid English words concatenated with a Korean word
-    {L"hello" L"\xC548\xB155\xD558\xC138\xC694" L"hello", true, 0, 0},
+    {L"hello" L"\xC548\xB155\xD558\xC138\xC694" L"hello", true},
     // Two valid English words concatenated with a Japanese word
-    {L"hello" L"\x3053\x3093\x306B\x3061\x306F" L"hello", true, 0, 0},
+    {L"hello" L"\x3053\x3093\x306B\x3061\x306F" L"hello", true},
     // [ROBUSTNESS] Two valid English words concatenated with a Hindi word
-    {L"hello" L"\x0930\x093E\x091C\x0927\x093E\x0928" L"hello" , true, 0, 0},
+    {L"hello" L"\x0930\x093E\x091C\x0927\x093E\x0928" L"hello" , true},
     // [ROBUSTNESS] Two valid English words concatenated with two Greek words
     {L"hello" L"\x03B3\x03B5\x03B9\x03AC" L" " L"\x03C3\x03BF\x03C5"
-     L"hello", true, 0, 0},
+     L"hello", true},
     // [ROBUSTNESS] Two valid English words concatenated with a Russian word
     {L"hello" L"\x0437\x0434\x0440\x0430\x0432\x0441"
-     L"\x0442\x0432\x0443\x0439\x0442\x0435" L"hello", true, 0, 0},
+     L"\x0442\x0432\x0443\x0439\x0442\x0435" L"hello", true},
     // [ROBUSTNESS] Two valid English words concatenated with a contraction
     // character.
-    {L"hello:hello", true, 0, 0},
+    {L"hello:hello", true},
 
     // An invalid English word
     {L"ifmmp", false, 0, 5},
@@ -334,6 +334,11 @@ TEST_F(SpellCheckTest, SpellCheckStrings_EN_US) {
     // spellcheck" <http://crbug.com/13432>.
     {L"qwertyuiopasd", false, 0, 13},
     {L"qwertyuiopasdf", false, 0, 14},
+
+    // [REGRESSION] Issue 128896: "en_US hunspell dictionary includes
+    // acknowledgement but not acknowledgements" <http://crbug.com/128896>
+    {L"acknowledgement", true},
+    {L"acknowledgements", true},
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kTestCases); ++i) {