WebString: makes string16 conversions explicit (part 1: blink, content)

content/renderer/manifest/manifest_parser.cc

 // Copyright 2014 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 "content/renderer/manifest/manifest_parser.h"
 
 #include <stddef.h>
 
 #include "base/json/json_reader.h"
 #include "base/memory/ptr_util.h"
@@ skipping 118 matching lines @@
 }
 
 int64_t ManifestParser::ParseColor(
     const base::DictionaryValue& dictionary,
     const std::string& key) {
   base::NullableString16 parsed_color = ParseString(dictionary, key, Trim);
   if (parsed_color.is_null())
     return Manifest::kInvalidOrMissingColor;
 
   blink::WebColor color;
-  if (!blink::WebCSSParser::parseColor(&color, parsed_color.string())) {
+  if (!blink::WebCSSParser::parseColor(
+          &color, blink::WebString::fromUTF16(parsed_color.string()))) {
     AddErrorInfo("property '" + key + "' ignored, '" +
                  base::UTF16ToUTF8(parsed_color.string()) + "' is not a " +
                  "valid color.");
       return Manifest::kInvalidOrMissingColor;
   }
 
   // We do this here because Java does not have an unsigned int32_t type so
   // colors with high alpha values will be negative. Instead of doing the
   // conversion after we pass over to Java, we do it here as it is easier and
   // clearer.
@@ skipping 109 matching lines @@
 
 std::vector<gfx::Size> ManifestParser::ParseIconSizes(
     const base::DictionaryValue& icon) {
   base::NullableString16 sizes_str = ParseString(icon, "sizes", NoTrim);
   std::vector<gfx::Size> sizes;
 
   if (sizes_str.is_null())
     return sizes;
 
   blink::WebVector<blink::WebSize> web_sizes =
-      blink::WebIconSizesParser::parseIconSizes(sizes_str.string());
+      blink::WebIconSizesParser::parseIconSizes(
+          blink::WebString::fromUTF16(sizes_str.string()));
   sizes.resize(web_sizes.size());
   for (size_t i = 0; i < web_sizes.size(); ++i)
     sizes[i] = web_sizes[i];
   if (sizes.empty()) {
     AddErrorInfo("found icon with no valid size.");
   }
   return sizes;
 }
 
 std::vector<Manifest::Icon> ManifestParser::ParseIcons(
@@ skipping 108 matching lines @@
 }
 
 void ManifestParser::AddErrorInfo(const std::string& error_msg,
                                   bool critical,
                                   int error_line,
                                   int error_column) {
   errors_.push_back({error_msg, critical, error_line, error_column});
 }
 
 } // namespace content