[SelectMiss...Async #2] Change ContextMenuClient::SelectMisspellingAsync() to return pair of strings

third_party/WebKit/Source/core/page/ContextMenuClient.cpp

 /*
  * Copyright (C) 2009, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 342 matching lines @@
     }
   }
 
   if (r.IsContentEditable()) {
     data.is_editable = true;
 
     // Spellchecker adds spelling markers to misspelled words and attaches
     // suggestions to these markers in the background. Therefore, when a
     // user right-clicks a mouse on a word, Chrome just needs to find a
     // spelling marker on the word instead of spellchecking it.
-    String description;
-    data.misspelled_word =
-        selected_frame->GetSpellChecker().SelectMisspellingAsync(description);
+    std::pair<String, String> misspelled_word_and_description =
+        selected_frame->GetSpellChecker().SelectMisspellingAsync();
+    data.misspelled_word = misspelled_word_and_description.first;
+    const String& description = misspelled_word_and_description.second;
     if (description.length()) {
       Vector<String> suggestions;
       description.Split('\n', suggestions);
       data.dictionary_suggestions = suggestions;
     } else if (selected_web_frame->TextCheckClient()) {
       int misspelled_offset, misspelled_length;
       selected_web_frame->TextCheckClient()->CheckSpelling(
           data.misspelled_word, misspelled_offset, misspelled_length,
           &data.dictionary_suggestions);
     }
@@ skipping 132 matching lines @@
     output_items[i] = sub_items[i];
   sub_menu_items.Swap(output_items);
 }
 
 void ContextMenuClient::PopulateCustomMenuItems(const ContextMenu* default_menu,
                                                 WebContextMenuData* data) {
   PopulateSubMenuItems(default_menu->Items(), data->custom_items);
 }
 
 }  // namespace blink