Allow storing multiple replacements on SpellCheckResult

components/spellcheck/renderer/spellcheck_unittest.cc

Index: components/spellcheck/renderer/spellcheck_unittest.cc
diff --git a/components/spellcheck/renderer/spellcheck_unittest.cc b/components/spellcheck/renderer/spellcheck_unittest.cc
index ef73f2d36d1400359afffa5636baf174927fbfc7..f735b3e5efd5505318ea3c3aa782659e4bab33d3 100644
--- a/components/spellcheck/renderer/spellcheck_unittest.cc
+++ b/components/spellcheck/renderer/spellcheck_unittest.cc
@@ -1140,7 +1140,7 @@ 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,
@@ -1158,7 +1158,7 @@ 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,
@@ -1180,38 +1180,48 @@ TEST_F(SpellCheckTest, CreateTextCheckingResultsKeepsTypographicalApostrophe) {
   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,
@@ -1230,9 +1240,9 @@ TEST_F(SpellCheckTest, CreateTextCheckingResultsKeepsTypographicalApostrophe) {
   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() << "\"";
   }
 }