Allow storing multiple replacements on SpellCheckResult

components/spellcheck/renderer/spellcheck_unittest.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/spellcheck.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <utility>
@@ skipping 1122 matching lines @@
 }
 
 #endif
 
 // Verify that the SpellCheck class keeps the spelling marker added to a
 // misspelled word "zz".
 TEST_F(SpellCheckTest, CreateTextCheckingResultsKeepsMarkers) {
   base::string16 text = base::ASCIIToUTF16("zz");
   std::vector<SpellCheckResult> spellcheck_results;
   spellcheck_results.push_back(
-      SpellCheckResult(SpellCheckResult::SPELLING, 0, 2, base::string16()));
+      SpellCheckResult(SpellCheckResult::SPELLING, 0, 2));
   blink::WebVector<blink::WebTextCheckingResult> textcheck_results;
   spell_check()->CreateTextCheckingResults(SpellCheck::USE_NATIVE_CHECKER, 0,
                                            text, spellcheck_results,
                                            &textcheck_results);
   ASSERT_EQ(spellcheck_results.size(), textcheck_results.size());
   EXPECT_EQ(blink::kWebTextDecorationTypeSpelling,
             textcheck_results[0].decoration);
   EXPECT_EQ(spellcheck_results[0].location, textcheck_results[0].location);
   EXPECT_EQ(spellcheck_results[0].length, textcheck_results[0].length);
 }
 
 // Verify that the SpellCheck class replaces the spelling marker added to a
 // contextually-misspelled word "bean" with a grammar marker.
 TEST_F(SpellCheckTest, CreateTextCheckingResultsAddsGrammarMarkers) {
   base::string16 text = base::ASCIIToUTF16("I have bean to USA.");
   std::vector<SpellCheckResult> spellcheck_results;
   spellcheck_results.push_back(
-      SpellCheckResult(SpellCheckResult::SPELLING, 7, 4, base::string16()));
+      SpellCheckResult(SpellCheckResult::SPELLING, 7, 4));
   blink::WebVector<blink::WebTextCheckingResult> textcheck_results;
   spell_check()->CreateTextCheckingResults(SpellCheck::USE_NATIVE_CHECKER, 0,
                                            text, spellcheck_results,
                                            &textcheck_results);
   ASSERT_EQ(spellcheck_results.size(), textcheck_results.size());
   EXPECT_EQ(blink::kWebTextDecorationTypeGrammar,
             textcheck_results[0].decoration);
   EXPECT_EQ(spellcheck_results[0].location, textcheck_results[0].location);
   EXPECT_EQ(spellcheck_results[0].length, textcheck_results[0].length);
 }
 
 // Verify that the SpellCheck preserves the original apostrophe type in the
 // checked text, regardless of the type of apostrophe the browser returns.
 TEST_F(SpellCheckTest, CreateTextCheckingResultsKeepsTypographicalApostrophe) {
   base::string16 text = base::WideToUTF16(
         L"Ik've havn" TYPOGRAPHICAL_APOSTROPHE L"t ni'n"
         TYPOGRAPHICAL_APOSTROPHE L"out-s I've I" TYPOGRAPHICAL_APOSTROPHE
         L"ve");
   std::vector<SpellCheckResult> spellcheck_results;
 
   // All typewriter apostrophe results.
-  spellcheck_results.push_back(SpellCheckResult(SpellCheckResult::SPELLING, 0,
-                                                5, base::UTF8ToUTF16("I've")));
   spellcheck_results.push_back(SpellCheckResult(
-      SpellCheckResult::SPELLING, 6, 6, base::UTF8ToUTF16("haven't")));
+      SpellCheckResult::SPELLING, 0, 5,
+      std::vector<base::string16>({base::UTF8ToUTF16("I've")})));

[groby-ooo-7-16, 2017/04/28 23:45:55]

That code is fairly ugly by now... I wonder if we should allow a convenience
ctor that just takes a string16, instead of a vector? Or at least a MakeResult
helper function (which could then go and take care of UTF8 and wstring
conversion, too)

   spellcheck_results.push_back(SpellCheckResult(
-      SpellCheckResult::SPELLING, 13, 10, base::UTF8ToUTF16("in'n'out's")));
+      SpellCheckResult::SPELLING, 6, 6,
+      std::vector<base::string16>({base::UTF8ToUTF16("haven't")})));
+  spellcheck_results.push_back(SpellCheckResult(
+      SpellCheckResult::SPELLING, 13, 10,
+      std::vector<base::string16>({base::UTF8ToUTF16("in'n'out's")})));
 
   // Replacements that differ only by apostrophe type should be ignored.
-  spellcheck_results.push_back(SpellCheckResult(SpellCheckResult::SPELLING, 24,
-                                                4, base::UTF8ToUTF16("I've")));
-  spellcheck_results.push_back(SpellCheckResult(SpellCheckResult::SPELLING, 29,
-                                                4, base::UTF8ToUTF16("I've")));
+  spellcheck_results.push_back(SpellCheckResult(
+      SpellCheckResult::SPELLING, 24, 4,
+      std::vector<base::string16>({base::UTF8ToUTF16("I've")})));
+  spellcheck_results.push_back(SpellCheckResult(
+      SpellCheckResult::SPELLING, 29, 4,
+      std::vector<base::string16>({base::UTF8ToUTF16("I've")})));
 
   // All typographical apostrophe results.
-  spellcheck_results.push_back(
-      SpellCheckResult(SpellCheckResult::SPELLING, 0, 5,
-                       base::WideToUTF16(L"I" TYPOGRAPHICAL_APOSTROPHE L"ve")));
+  spellcheck_results.push_back(SpellCheckResult(
+      SpellCheckResult::SPELLING, 0, 5,
+      std::vector<base::string16>(
+          {base::WideToUTF16(L"I" TYPOGRAPHICAL_APOSTROPHE L"ve")})));
   spellcheck_results.push_back(SpellCheckResult(
       SpellCheckResult::SPELLING, 6, 6,
-      base::WideToUTF16(L"haven" TYPOGRAPHICAL_APOSTROPHE L"t")));
+      std::vector<base::string16>(
+          {base::WideToUTF16(L"haven" TYPOGRAPHICAL_APOSTROPHE L"t")})));
   spellcheck_results.push_back(SpellCheckResult(
-        SpellCheckResult::SPELLING, 13, 10, base::WideToUTF16(
-            L"in" TYPOGRAPHICAL_APOSTROPHE L"n" TYPOGRAPHICAL_APOSTROPHE L"out"
-            TYPOGRAPHICAL_APOSTROPHE L"s")));
+      SpellCheckResult::SPELLING, 13, 10,
+      std::vector<base::string16>({base::WideToUTF16(
+          L"in" TYPOGRAPHICAL_APOSTROPHE L"n" TYPOGRAPHICAL_APOSTROPHE L"ou"
+          L"t" TYPOGRAPHICAL_APOSTROPHE L"s")})));
 
   // Replacements that differ only by apostrophe type should be ignored.
-  spellcheck_results.push_back(
-      SpellCheckResult(SpellCheckResult::SPELLING, 24, 4,
-                       base::WideToUTF16(L"I" TYPOGRAPHICAL_APOSTROPHE L"ve")));
-  spellcheck_results.push_back(
-      SpellCheckResult(SpellCheckResult::SPELLING, 29, 4,
-                       base::WideToUTF16(L"I" TYPOGRAPHICAL_APOSTROPHE L"ve")));
+  spellcheck_results.push_back(SpellCheckResult(
+      SpellCheckResult::SPELLING, 24, 4,
+      std::vector<base::string16>(
+          {base::WideToUTF16(L"I" TYPOGRAPHICAL_APOSTROPHE L"ve")})));
+  spellcheck_results.push_back(SpellCheckResult(
+      SpellCheckResult::SPELLING, 29, 4,
+      std::vector<base::string16>(
+          {base::WideToUTF16(L"I" TYPOGRAPHICAL_APOSTROPHE L"ve")})));
 
   blink::WebVector<blink::WebTextCheckingResult> textcheck_results;
   spell_check()->CreateTextCheckingResults(SpellCheck::USE_NATIVE_CHECKER, 0,
                                            text, spellcheck_results,
                                            &textcheck_results);
 
   static const wchar_t* kExpectedReplacements[] = {
       L"I've",
       L"haven" TYPOGRAPHICAL_APOSTROPHE L"t",
       L"in'n" TYPOGRAPHICAL_APOSTROPHE L"out's",
       L"I've",
       L"haven" TYPOGRAPHICAL_APOSTROPHE L"t",
       L"in'n" TYPOGRAPHICAL_APOSTROPHE L"out" TYPOGRAPHICAL_APOSTROPHE L"s",
   };
 
   ASSERT_EQ(arraysize(kExpectedReplacements), textcheck_results.size());
   for (size_t i = 0; i < arraysize(kExpectedReplacements); ++i) {
     EXPECT_EQ(base::WideToUTF16(kExpectedReplacements[i]),
-              textcheck_results[i].replacement.Utf16())
+              textcheck_results[i].replacements[0].Utf16())
         << "i=" << i << "\nactual: \""
-        << textcheck_results[i].replacement.Utf16() << "\"";
+        << textcheck_results[i].replacements[0].Utf16() << "\"";
   }
 }
 
 // Checks some words that should be present in all English dictionaries.
 TEST_F(SpellCheckTest, EnglishWords) {
   static const struct {
     const char* input;
     bool should_pass;
   } kTestCases[] = {
     // Issue 146093: "Chromebook" and "Chromebox" not included in spell-checking
@@ skipping 317 matching lines @@
   // to be updated accordingly.
   ASSERT_EQ(5, spellcheck::kMaxSuggestions);
   FillSuggestions(suggestions_list, &suggestion_results);
   ASSERT_EQ(5U, suggestion_results.size());
   EXPECT_EQ(base::ASCIIToUTF16("0foo"), suggestion_results[0]);
   EXPECT_EQ(base::ASCIIToUTF16("1foo"), suggestion_results[1]);
   EXPECT_EQ(base::ASCIIToUTF16("2foo"), suggestion_results[2]);
   EXPECT_EQ(base::ASCIIToUTF16("0bar"), suggestion_results[3]);
   EXPECT_EQ(base::ASCIIToUTF16("1bar"), suggestion_results[4]);
 }