[spellcheck] Updated Hunspell to 1.5.4

components/spellcheck/renderer/hunspell_engine.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 "components/spellcheck/renderer/hunspell_engine.h"
 
 #include <stddef.h>
 #include <algorithm>
 #include <iterator>
 #include <utility>
@@ skipping 68 matching lines @@
   // the user.
   bool word_correct = true;
   std::string word_to_check_utf8(base::UTF16ToUTF8(word_to_check));
 
   // Limit the size of checked words.
   if (word_to_check_utf8.length() <= kMaxCheckedLen) {
     // If |hunspell_| is NULL here, an error has occurred, but it's better
     // to check rather than crash.
     if (hunspell_.get()) {
       // |hunspell_->spell| returns 0 if the word is misspelled.
-      word_correct = (hunspell_->spell(word_to_check_utf8.c_str()) != 0);
+      word_correct = (hunspell_->spell(word_to_check_utf8) != 0);
     }
   }
 
   return word_correct;
 }
 
 void HunspellEngine::FillSuggestionList(
     const base::string16& wrong_word,
     std::vector<base::string16>* optional_suggestions) {
   std::string wrong_word_utf8(base::UTF16ToUTF8(wrong_word));
   if (wrong_word_utf8.length() > kMaxSuggestLen)
     return;
 
   // If |hunspell_| is NULL here, an error has occurred, but it's better
   // to check rather than crash.
   // TODO(groby): Technically, it's not. We should track down the issue.
   if (!hunspell_.get())
     return;
 
-  char** suggestions = NULL;
-  int number_of_suggestions =
-      hunspell_->suggest(&suggestions, wrong_word_utf8.c_str());
+  std::vector<std::string> suggestions =
+      hunspell_->suggest(wrong_word_utf8);
 
   // Populate the vector of WideStrings.
-  for (int i = 0; i < number_of_suggestions; ++i) {
+  for (size_t i = 0; i < suggestions.size(); ++i) {
     if (i < spellcheck::kMaxSuggestions)
       optional_suggestions->push_back(base::UTF8ToUTF16(suggestions[i]));
-    free(suggestions[i]);
   }
-  if (suggestions != NULL)
-    free(suggestions);
 }
 
 bool HunspellEngine::InitializeIfNeeded() {
   if (!initialized_ && !dictionary_requested_) {
     // RenderThread will not exist in test.
     if (RenderThread::Get())
       RenderThread::Get()->Send(new SpellCheckHostMsg_RequestDictionary);
     dictionary_requested_ = true;
     return true;
   }
 
   // Don't initialize if hunspell is disabled.
   if (file_.IsValid())
     InitializeHunspell();
 
   return !initialized_;
 }
 
 bool HunspellEngine::IsEnabled() {
   return hunspell_enabled_;
 }