Reapply Justin's spellchecker patch.

chrome/renderer/spellchecker/spellcheck.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/renderer/spellchecker/spellcheck.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/metrics/histogram.h"
 #include "base/message_loop_proxy.h"
@@ skipping 332 matching lines @@
     }
 
     DHISTOGRAM_TIMES("Spellcheck.InitTime",
                      base::Histogram::DebugNow() - debug_start_time);
   } else {
     NOTREACHED() << "Could not mmap spellchecker dictionary.";
   }
 }
 
 void SpellCheck::AddWordToHunspell(const std::string& word) {
-  if (!word.empty() && word.length() < MAXWORDUTF8LEN)
+  if (!word.empty() && word.length() < MAXWORDLEN)
     hunspell_->add(word.c_str());
 }
 
 bool SpellCheck::InitializeIfNeeded() {
   if (is_using_platform_spelling_engine_)
     return false;
 
   if (!initialized_ && !dictionary_requested_) {
     // RenderThread will not exist in test.
     if (RenderThread::Get())
@@ skipping 15 matching lines @@
   bool word_correct = false;
 
   if (is_using_platform_spelling_engine_) {
 #if defined(OS_MACOSX)
     RenderThread::Get()->Send(new SpellCheckHostMsg_CheckSpelling(
         word_to_check, tag, &word_correct));
 #endif
   } else {
     std::string word_to_check_utf8(UTF16ToUTF8(word_to_check));
     // Hunspell shouldn't let us exceed its max, but check just in case
-    if (word_to_check_utf8.length() < MAXWORDUTF8LEN) {
+    if (word_to_check_utf8.length() < MAXWORDLEN) {
       if (hunspell_.get()) {
         // |hunspell_->spell| returns 0 if the word is spelled correctly and
         // non-zero otherwsie.
         word_correct = (hunspell_->spell(word_to_check_utf8.c_str()) != 0);
       } else {
         // If |hunspell_| is NULL here, an error has occurred, but it's better
         // to check rather than crash.
         word_correct = true;
       }
     }
@@ skipping 114 matching lines @@
       }
     }
     list[i] = WebKit::WebTextCheckingResult(type,
                                             word_location + line_offset,
                                             word_length,
                                             spellcheck_results[i].replacement);
   }
   textcheck_results->swap(list);
 }
 #endif