[Reland] Allow storing multiple replacements on SpellCheckResult

chrome/browser/spellchecker/spell_check_host_impl_unittest.cc

 // Copyright 2017 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/browser/spellchecker/spell_check_host_impl.h"
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 45 matching lines @@
                                              base::ASCIIToUTF16("World")));
   TestSpellCheckHostImpl host_impl;
   host_impl.GetCustomDictionary().AddWord("Helllo");
   std::vector<SpellCheckResult> results =
       host_impl.FilterCustomWordResults("Helllo Warld", service_results);
   ASSERT_EQ(1u, results.size());
 
   EXPECT_EQ(service_results[1].decoration, results[0].decoration);
   EXPECT_EQ(service_results[1].location, results[0].location);
   EXPECT_EQ(service_results[1].length, results[0].length);
-  EXPECT_EQ(service_results[1].replacement, results[0].replacement);
+  EXPECT_EQ(service_results[1].replacements.size(),
+            results[0].replacements.size());
+  EXPECT_EQ(service_results[1].replacements[0], results[0].replacements[0]);
 }
 
 // Spelling corrections of words that are not in the custom dictionary should
 // be retained in the results returned by the remote Spelling service.
 TEST(SpellCheckHostImplTest, SpellingServiceResults) {
   std::vector<SpellCheckResult> service_results;
   service_results.push_back(SpellCheckResult(SpellCheckResult::SPELLING, 0, 6,
                                              base::ASCIIToUTF16("Hello")));
   service_results.push_back(SpellCheckResult(SpellCheckResult::SPELLING, 7, 5,
                                              base::ASCIIToUTF16("World")));
   TestSpellCheckHostImpl host_impl;
   host_impl.GetCustomDictionary().AddWord("Hulo");
   std::vector<SpellCheckResult> results =
       host_impl.FilterCustomWordResults("Helllo Warld", service_results);
   ASSERT_EQ(service_results.size(), results.size());
 
   for (size_t i = 0; i < results.size(); ++i) {
     EXPECT_EQ(service_results[i].decoration, results[i].decoration);
     EXPECT_EQ(service_results[i].location, results[i].location);
     EXPECT_EQ(service_results[i].length, results[i].length);
-    EXPECT_EQ(service_results[i].replacement, results[i].replacement);
+    EXPECT_EQ(service_results[i].replacements.size(),
+              results[i].replacements.size());
+    EXPECT_EQ(service_results[i].replacements, results[i].replacements);

[Noel Gordon, 2017/05/31 05:46:21]

x[i].replacements -> x[i].replacements[0] here I think.

   }
 }