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

content/renderer/renderer_blink_platform_impl.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 "content/renderer/renderer_blink_platform_impl.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/command_line.h"
@@ skipping 690 matching lines @@
       layout = media::CHANNEL_LAYOUT_7_1;
       break;
     default:
       // If the layout is not supported (more than 9 channels), falls back to
       // discrete mode.
       layout = media::CHANNEL_LAYOUT_DISCRETE;
   }
 
   int session_id = 0;
   if (input_device_id.isNull() ||
-      !base::StringToInt(base::UTF16ToUTF8(
-          base::StringPiece16(input_device_id)), &session_id)) {
+      !base::StringToInt(input_device_id.utf8(), &session_id)) {
     if (input_channels > 0)
       DLOG(WARNING) << "createAudioDevice(): request for audio input ignored";
 
     input_channels = 0;
   }
 
   // For CHANNEL_LAYOUT_DISCRETE, pass the explicit channel count along with
   // the channel layout when creating an |AudioParameters| object.
   media::AudioParameters params(media::AudioParameters::AUDIO_PCM_LOW_LATENCY,
                                 layout, static_cast<int>(sample_rate), 16,
@@ skipping 28 matching lines @@
     bool refresh,
     const blink::WebSecurityOrigin& mainFrameOrigin,
     blink::WebPluginListBuilder* builder) {
 #if BUILDFLAG(ENABLE_PLUGINS)
   std::vector<WebPluginInfo> plugins;
   if (!plugin_refresh_allowed_)
     refresh = false;
   RenderThread::Get()->Send(
       new FrameHostMsg_GetPlugins(refresh, mainFrameOrigin, &plugins));
   for (const WebPluginInfo& plugin : plugins) {
-    builder->addPlugin(
-        plugin.name, plugin.desc,
-        plugin.path.BaseName().AsUTF16Unsafe());
+    builder->addPlugin(WebString::fromUTF16(plugin.name),
+                       WebString::fromUTF16(plugin.desc),
+                       blink::FilePathToWebString(plugin.path.BaseName()));
 
     for (const WebPluginMimeType& mime_type : plugin.mime_types) {
       builder->addMediaTypeToLastPlugin(
-          WebString::fromUTF8(mime_type.mime_type), mime_type.description);
+          WebString::fromUTF8(mime_type.mime_type),
+          WebString::fromUTF16(mime_type.description));
 
       for (const auto& extension : mime_type.file_extensions) {
         builder->addFileExtensionToLastMediaType(
             WebString::fromUTF8(extension));
       }
     }
   }
 #endif
 }
 
@@ skipping 334 matching lines @@
 //------------------------------------------------------------------------------
 
 blink::WebCompositorSupport* RendererBlinkPlatformImpl::compositorSupport() {
   return &compositor_support_;
 }
 
 //------------------------------------------------------------------------------
 
 blink::WebString RendererBlinkPlatformImpl::convertIDNToUnicode(
     const blink::WebString& host) {
-  return url_formatter::IDNToUnicode(host.utf8());
+  return WebString::fromUTF16(url_formatter::IDNToUnicode(host.utf8()));
 }
 
 //------------------------------------------------------------------------------
 
 void RendererBlinkPlatformImpl::recordRappor(const char* metric,
                                              const blink::WebString& sample) {
   GetContentClient()->renderer()->RecordRappor(metric, sample.utf8());
 }
 
 void RendererBlinkPlatformImpl::recordRapporURL(const char* metric,
@@ skipping 167 matching lines @@
   return &trial_token_validator_;
 }
 
 void RendererBlinkPlatformImpl::workerContextCreated(
     const v8::Local<v8::Context>& worker) {
   GetContentClient()->renderer()->DidInitializeWorkerContextOnWorkerThread(
       worker);
 }
 
 }  // namespace content