Use explicit WebString <-> string16 conversion methods in media files

content/renderer/media/midi_message_filter.cc

Index: content/renderer/media/midi_message_filter.cc
diff --git a/content/renderer/media/midi_message_filter.cc b/content/renderer/media/midi_message_filter.cc
index 9adeca7763dde8470bbd8084439bc9eba88a783c..bed8d0efa547f2eb5d71d6bb50a1b8ef82fd0989 100644
--- a/content/renderer/media/midi_message_filter.cc
+++ b/content/renderer/media/midi_message_filter.cc
@@ -15,6 +15,7 @@
 #include "ipc/ipc_logging.h"
 
 using base::AutoLock;
+using blink::WebString;
 using midi::mojom::PortState;
 using midi::mojom::Result;
 
@@ -211,17 +212,17 @@ void MidiMessageFilter::HandleClientAdded(Result result) {
     if (result == Result::OK) {
       // Add the client's input and output ports.
       for (const auto& info : inputs_) {
-        client->didAddInputPort(base::UTF8ToUTF16(info.id),
-                                base::UTF8ToUTF16(info.manufacturer),
-                                base::UTF8ToUTF16(info.name),
-                                base::UTF8ToUTF16(info.version), info.state);
+        client->didAddInputPort(WebString::fromUTF8(info.id),
+                                WebString::fromUTF8(info.manufacturer),
+                                WebString::fromUTF8(info.name),
+                                WebString::fromUTF8(info.version), info.state);
       }
 
       for (const auto& info : outputs_) {
-        client->didAddOutputPort(base::UTF8ToUTF16(info.id),
-                                 base::UTF8ToUTF16(info.manufacturer),
-                                 base::UTF8ToUTF16(info.name),
-                                 base::UTF8ToUTF16(info.version), info.state);
+        client->didAddOutputPort(WebString::fromUTF8(info.id),
+                                 WebString::fromUTF8(info.manufacturer),
+                                 WebString::fromUTF8(info.name),
+                                 WebString::fromUTF8(info.version), info.state);

[kinuko, 2016/12/17 02:27:14]

If some of these could be guaranteed to be ascii we can also use fromASCII for
these.

       }
     }
     client->didStartSession(result);
@@ -232,10 +233,10 @@ void MidiMessageFilter::HandleClientAdded(Result result) {
 void MidiMessageFilter::HandleAddInputPort(midi::MidiPortInfo info) {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
   inputs_.push_back(info);
-  const base::string16 id = base::UTF8ToUTF16(info.id);
-  const base::string16 manufacturer = base::UTF8ToUTF16(info.manufacturer);
-  const base::string16 name = base::UTF8ToUTF16(info.name);
-  const base::string16 version = base::UTF8ToUTF16(info.version);
+  const WebString id = WebString::fromUTF8(info.id);
+  const WebString manufacturer = WebString::fromUTF8(info.manufacturer);
+  const WebString name = WebString::fromUTF8(info.name);
+  const WebString version = WebString::fromUTF8(info.version);
   for (auto* client : clients_)
     client->didAddInputPort(id, manufacturer, name, version, info.state);
 }
@@ -243,10 +244,10 @@ void MidiMessageFilter::HandleAddInputPort(midi::MidiPortInfo info) {
 void MidiMessageFilter::HandleAddOutputPort(midi::MidiPortInfo info) {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
   outputs_.push_back(info);
-  const base::string16 id = base::UTF8ToUTF16(info.id);
-  const base::string16 manufacturer = base::UTF8ToUTF16(info.manufacturer);
-  const base::string16 name = base::UTF8ToUTF16(info.name);
-  const base::string16 version = base::UTF8ToUTF16(info.version);
+  const WebString id = WebString::fromUTF8(info.id);
+  const WebString manufacturer = WebString::fromUTF8(info.manufacturer);
+  const WebString name = WebString::fromUTF8(info.name);
+  const WebString version = WebString::fromUTF8(info.version);
   for (auto* client : clients_)
     client->didAddOutputPort(id, manufacturer, name, version, info.state);
 }