Use explicit WebString conversions in spellcheck

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 1219 matching lines @@
       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)
+              textcheck_results[i].replacement.utf16())
         << "i=" << i << "\nactual: \""
-        << base::string16(textcheck_results[i].replacement) << "\"";
+        << textcheck_results[i].replacement.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]);
 }