Use explicit WebString conversions in spellcheck

components/spellcheck/renderer/spellcheck.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 <stdint.h>
 #include <algorithm>
 #include <utility>
@@ skipping 381 matching lines @@
                        kNoTag,
                        &misspelling_start,
                        &misspelling_length,
                        NULL)) {
       results->assign(textcheck_results);
       return true;
     }
 
     if (!custom_dictionary_.SpellCheckWord(
             text, misspelling_start, misspelling_length)) {
-      base::string16 replacement;
-      textcheck_results.push_back(WebTextCheckingResult(
-          blink::WebTextDecorationTypeSpelling,
-          misspelling_start,
-          misspelling_length,
-          replacement));
+      textcheck_results.push_back(
+          WebTextCheckingResult(blink::WebTextDecorationTypeSpelling,
+                                misspelling_start, misspelling_length));

[kinuko, 2017/01/23 04:37:49]

If we omit replacement parameter the ctor will use empty WebString (and that's
what we want)

     }
     position_in_text = misspelling_start + misspelling_length;
   }
   results->assign(textcheck_results);
   return false;
 #else
   // This function is only invoked for spell checker functionality that runs
   // on the render thread. OSX and Android builds don't have that.
   NOTREACHED();
   return true;
@@ skipping 106 matching lines @@
                          misspelled_word.length(), kNoTag,
                          &unused_misspelling_start, &unused_misspelling_length,
                          nullptr)) {
         decoration = SpellCheckResult::GRAMMAR;
       }
     }
 
     results.push_back(WebTextCheckingResult(
         static_cast<WebTextDecorationType>(decoration),
         line_offset + spellcheck_result.location, spellcheck_result.length,
-        replacement, spellcheck_result.hash));
+        blink::WebString::fromUTF16(replacement), spellcheck_result.hash));
   }
 
   textcheck_results->assign(results);
 }
 
 bool SpellCheck::IsSpellcheckEnabled() {
 #if defined(OS_ANDROID)
   if (!spellcheck::IsAndroidSpellCheckFeatureEnabled()) return false;
 #endif
   return spellcheck_enabled_;
 }