Commit 4a18cc01 authored by kinuko's avatar kinuko Committed by Commit bot

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

As we're deprecating implicit conversions for WebString <-> string16
replace them with explicit methods. (See crbug.com/667131 for more
details)

BUG=667131

Review-Url: https://codereview.chromium.org/2584893002
Cr-Commit-Position: refs/heads/master@{#439736}
parent 36f398db
...@@ -257,7 +257,7 @@ void CanvasCaptureHandler::AddVideoCapturerSourceToVideoTrack( ...@@ -257,7 +257,7 @@ void CanvasCaptureHandler::AddVideoCapturerSourceToVideoTrack(
blink::WebMediaStreamTrack* web_track) { blink::WebMediaStreamTrack* web_track) {
std::string str_track_id; std::string str_track_id;
base::Base64Encode(base::RandBytesAsString(64), &str_track_id); base::Base64Encode(base::RandBytesAsString(64), &str_track_id);
const blink::WebString track_id = base::UTF8ToUTF16(str_track_id); const blink::WebString track_id = blink::WebString::fromASCII(str_track_id);
blink::WebMediaStreamSource webkit_source; blink::WebMediaStreamSource webkit_source;
std::unique_ptr<MediaStreamVideoSource> media_stream_source( std::unique_ptr<MediaStreamVideoSource> media_stream_source(
new MediaStreamVideoCapturerSource( new MediaStreamVideoCapturerSource(
......
...@@ -68,7 +68,7 @@ MediaStreamRendererFactoryImpl::GetVideoRenderer( ...@@ -68,7 +68,7 @@ MediaStreamRendererFactoryImpl::GetVideoRenderer(
DCHECK(!web_stream.isNull()); DCHECK(!web_stream.isNull());
DVLOG(1) << "MediaStreamRendererFactoryImpl::GetVideoRenderer stream:" DVLOG(1) << "MediaStreamRendererFactoryImpl::GetVideoRenderer stream:"
<< base::UTF16ToUTF8(base::StringPiece16(web_stream.id())); << web_stream.id().utf8();
blink::WebVector<blink::WebMediaStreamTrack> video_tracks; blink::WebVector<blink::WebMediaStreamTrack> video_tracks;
web_stream.videoTracks(video_tracks); web_stream.videoTracks(video_tracks);
...@@ -95,7 +95,7 @@ MediaStreamRendererFactoryImpl::GetAudioRenderer( ...@@ -95,7 +95,7 @@ MediaStreamRendererFactoryImpl::GetAudioRenderer(
return NULL; return NULL;
DVLOG(1) << "MediaStreamRendererFactoryImpl::GetAudioRenderer stream:" DVLOG(1) << "MediaStreamRendererFactoryImpl::GetAudioRenderer stream:"
<< base::UTF16ToUTF8(base::StringPiece16(web_stream.id())); << web_stream.id().utf8();
// TODO(tommi): We need to fix the data flow so that // TODO(tommi): We need to fix the data flow so that
// it works the same way for all track implementations, local, remote or what // it works the same way for all track implementations, local, remote or what
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include "ipc/ipc_logging.h" #include "ipc/ipc_logging.h"
using base::AutoLock; using base::AutoLock;
using blink::WebString;
using midi::mojom::PortState; using midi::mojom::PortState;
using midi::mojom::Result; using midi::mojom::Result;
...@@ -211,17 +212,17 @@ void MidiMessageFilter::HandleClientAdded(Result result) { ...@@ -211,17 +212,17 @@ void MidiMessageFilter::HandleClientAdded(Result result) {
if (result == Result::OK) { if (result == Result::OK) {
// Add the client's input and output ports. // Add the client's input and output ports.
for (const auto& info : inputs_) { for (const auto& info : inputs_) {
client->didAddInputPort(base::UTF8ToUTF16(info.id), client->didAddInputPort(WebString::fromUTF8(info.id),
base::UTF8ToUTF16(info.manufacturer), WebString::fromUTF8(info.manufacturer),
base::UTF8ToUTF16(info.name), WebString::fromUTF8(info.name),
base::UTF8ToUTF16(info.version), info.state); WebString::fromUTF8(info.version), info.state);
} }
for (const auto& info : outputs_) { for (const auto& info : outputs_) {
client->didAddOutputPort(base::UTF8ToUTF16(info.id), client->didAddOutputPort(WebString::fromUTF8(info.id),
base::UTF8ToUTF16(info.manufacturer), WebString::fromUTF8(info.manufacturer),
base::UTF8ToUTF16(info.name), WebString::fromUTF8(info.name),
base::UTF8ToUTF16(info.version), info.state); WebString::fromUTF8(info.version), info.state);
} }
} }
client->didStartSession(result); client->didStartSession(result);
...@@ -232,10 +233,10 @@ void MidiMessageFilter::HandleClientAdded(Result result) { ...@@ -232,10 +233,10 @@ void MidiMessageFilter::HandleClientAdded(Result result) {
void MidiMessageFilter::HandleAddInputPort(midi::MidiPortInfo info) { void MidiMessageFilter::HandleAddInputPort(midi::MidiPortInfo info) {
DCHECK(main_task_runner_->BelongsToCurrentThread()); DCHECK(main_task_runner_->BelongsToCurrentThread());
inputs_.push_back(info); inputs_.push_back(info);
const base::string16 id = base::UTF8ToUTF16(info.id); const WebString id = WebString::fromUTF8(info.id);
const base::string16 manufacturer = base::UTF8ToUTF16(info.manufacturer); const WebString manufacturer = WebString::fromUTF8(info.manufacturer);
const base::string16 name = base::UTF8ToUTF16(info.name); const WebString name = WebString::fromUTF8(info.name);
const base::string16 version = base::UTF8ToUTF16(info.version); const WebString version = WebString::fromUTF8(info.version);
for (auto* client : clients_) for (auto* client : clients_)
client->didAddInputPort(id, manufacturer, name, version, info.state); client->didAddInputPort(id, manufacturer, name, version, info.state);
} }
...@@ -243,10 +244,10 @@ void MidiMessageFilter::HandleAddInputPort(midi::MidiPortInfo info) { ...@@ -243,10 +244,10 @@ void MidiMessageFilter::HandleAddInputPort(midi::MidiPortInfo info) {
void MidiMessageFilter::HandleAddOutputPort(midi::MidiPortInfo info) { void MidiMessageFilter::HandleAddOutputPort(midi::MidiPortInfo info) {
DCHECK(main_task_runner_->BelongsToCurrentThread()); DCHECK(main_task_runner_->BelongsToCurrentThread());
outputs_.push_back(info); outputs_.push_back(info);
const base::string16 id = base::UTF8ToUTF16(info.id); const WebString id = WebString::fromUTF8(info.id);
const base::string16 manufacturer = base::UTF8ToUTF16(info.manufacturer); const WebString manufacturer = WebString::fromUTF8(info.manufacturer);
const base::string16 name = base::UTF8ToUTF16(info.name); const WebString name = WebString::fromUTF8(info.name);
const base::string16 version = base::UTF8ToUTF16(info.version); const WebString version = WebString::fromUTF8(info.version);
for (auto* client : clients_) for (auto* client : clients_)
client->didAddOutputPort(id, manufacturer, name, version, info.state); client->didAddOutputPort(id, manufacturer, name, version, info.state);
} }
......
...@@ -32,10 +32,9 @@ MockWebRTCPeerConnectionHandlerClient:: ...@@ -32,10 +32,9 @@ MockWebRTCPeerConnectionHandlerClient::
void MockWebRTCPeerConnectionHandlerClient::didGenerateICECandidateWorker( void MockWebRTCPeerConnectionHandlerClient::didGenerateICECandidateWorker(
const blink::WebRTCICECandidate& candidate) { const blink::WebRTCICECandidate& candidate) {
if (!candidate.isNull()) { if (!candidate.isNull()) {
candidate_sdp_ = candidate_sdp_ = candidate.candidate().utf8();
base::UTF16ToUTF8(base::StringPiece16(candidate.candidate()));
candidate_mline_index_ = candidate.sdpMLineIndex(); candidate_mline_index_ = candidate.sdpMLineIndex();
candidate_mid_ = base::UTF16ToUTF8(base::StringPiece16(candidate.sdpMid())); candidate_mid_ = candidate.sdpMid().utf8();
} else { } else {
candidate_sdp_ = ""; candidate_sdp_ = "";
candidate_mline_index_ = -1; candidate_mline_index_ = -1;
......
...@@ -85,12 +85,12 @@ static std::string SerializeAnswerOptions( ...@@ -85,12 +85,12 @@ static std::string SerializeAnswerOptions(
static std::string SerializeMediaStreamComponent( static std::string SerializeMediaStreamComponent(
const blink::WebMediaStreamTrack& component) { const blink::WebMediaStreamTrack& component) {
return base::UTF16ToUTF8(base::StringPiece16(component.source().id())); return component.source().id().utf8();
} }
static std::string SerializeMediaDescriptor( static std::string SerializeMediaDescriptor(
const blink::WebMediaStream& stream) { const blink::WebMediaStream& stream) {
std::string id = base::UTF16ToUTF8(base::StringPiece16(stream.id())); std::string id = stream.id().utf8();
std::string result = "id: " + id; std::string result = "id: " + id;
blink::WebVector<blink::WebMediaStreamTrack> tracks; blink::WebVector<blink::WebMediaStreamTrack> tracks;
stream.audioTracks(tracks); stream.audioTracks(tracks);
...@@ -551,11 +551,10 @@ void PeerConnectionTracker::TrackAddIceCandidate( ...@@ -551,11 +551,10 @@ void PeerConnectionTracker::TrackAddIceCandidate(
int id = GetLocalIDForHandler(pc_handler); int id = GetLocalIDForHandler(pc_handler);
if (id == -1) if (id == -1)
return; return;
std::string value = std::string value = "sdpMid: " + candidate.sdpMid().utf8() + ", " +
"sdpMid: " + base::UTF16ToUTF8(base::StringPiece16(candidate.sdpMid())) + "sdpMLineIndex: " +
", " + "sdpMLineIndex: " + base::UintToString(candidate.sdpMLineIndex()) + base::UintToString(candidate.sdpMLineIndex()) + ", " +
", " + "candidate: " + "candidate: " + candidate.candidate().utf8();
base::UTF16ToUTF8(base::StringPiece16(candidate.candidate()));
// OnIceCandidate always succeeds as it's a callback from the browser. // OnIceCandidate always succeeds as it's a callback from the browser.
DCHECK(source != SOURCE_LOCAL || succeeded); DCHECK(source != SOURCE_LOCAL || succeeded);
...@@ -701,8 +700,7 @@ void PeerConnectionTracker::TrackCreateDTMFSender( ...@@ -701,8 +700,7 @@ void PeerConnectionTracker::TrackCreateDTMFSender(
int id = GetLocalIDForHandler(pc_handler); int id = GetLocalIDForHandler(pc_handler);
if (id == -1) if (id == -1)
return; return;
SendPeerConnectionUpdate(id, "createDTMFSender", SendPeerConnectionUpdate(id, "createDTMFSender", track.id().utf8());
base::UTF16ToUTF8(base::StringPiece16(track.id())));
} }
void PeerConnectionTracker::TrackGetUserMedia( void PeerConnectionTracker::TrackGetUserMedia(
......
...@@ -257,7 +257,7 @@ bool PepperToVideoTrackAdapter::Open(MediaStreamRegistryInterface* registry, ...@@ -257,7 +257,7 @@ bool PepperToVideoTrackAdapter::Open(MediaStreamRegistryInterface* registry,
blink::WebMediaStreamSource webkit_source; blink::WebMediaStreamSource webkit_source;
blink::WebMediaStreamSource::Type type = blink::WebMediaStreamSource::Type type =
blink::WebMediaStreamSource::TypeVideo; blink::WebMediaStreamSource::TypeVideo;
blink::WebString webkit_track_id = base::UTF8ToUTF16(track_id); blink::WebString webkit_track_id = blink::WebString::fromUTF8(track_id);
webkit_source.initialize(webkit_track_id, type, webkit_track_id, webkit_source.initialize(webkit_track_id, type, webkit_track_id,
false /* remote */); false /* remote */);
webkit_source.setExtraData(writer); webkit_source.setExtraData(writer);
......
...@@ -100,7 +100,7 @@ class RemoteMediaStreamTrackAdapter ...@@ -100,7 +100,7 @@ class RemoteMediaStreamTrackAdapter
DCHECK(main_thread_->BelongsToCurrentThread()); DCHECK(main_thread_->BelongsToCurrentThread());
DCHECK(webkit_track_.isNull()); DCHECK(webkit_track_.isNull());
blink::WebString webkit_track_id(base::UTF8ToUTF16(id_)); blink::WebString webkit_track_id(blink::WebString::fromUTF8(id_));
blink::WebMediaStreamSource webkit_source; blink::WebMediaStreamSource webkit_source;
webkit_source.initialize(webkit_track_id, type, webkit_track_id, webkit_source.initialize(webkit_track_id, type, webkit_track_id,
true /* remote */); true /* remote */);
...@@ -369,7 +369,7 @@ void RemoteMediaStreamImpl::InitializeOnMainThread(const std::string& label) { ...@@ -369,7 +369,7 @@ void RemoteMediaStreamImpl::InitializeOnMainThread(const std::string& label) {
webkit_video_tracks[i] = *video_track_observers_[i]->webkit_track(); webkit_video_tracks[i] = *video_track_observers_[i]->webkit_track();
} }
webkit_stream_.initialize(base::UTF8ToUTF16(label), webkit_stream_.initialize(blink::WebString::fromUTF8(label),
webkit_audio_tracks, webkit_video_tracks); webkit_audio_tracks, webkit_video_tracks);
webkit_stream_.setExtraData(new MediaStream()); webkit_stream_.setExtraData(new MediaStream());
} }
......
...@@ -177,7 +177,7 @@ void RtcDataChannelHandler::setClient( ...@@ -177,7 +177,7 @@ void RtcDataChannelHandler::setClient(
blink::WebString RtcDataChannelHandler::label() { blink::WebString RtcDataChannelHandler::label() {
DCHECK(thread_checker_.CalledOnValidThread()); DCHECK(thread_checker_.CalledOnValidThread());
return base::UTF8ToUTF16(channel()->label()); return blink::WebString::fromUTF8(channel()->label());
} }
bool RtcDataChannelHandler::isReliable() { bool RtcDataChannelHandler::isReliable() {
...@@ -202,7 +202,7 @@ unsigned short RtcDataChannelHandler::maxRetransmits() const { ...@@ -202,7 +202,7 @@ unsigned short RtcDataChannelHandler::maxRetransmits() const {
blink::WebString RtcDataChannelHandler::protocol() const { blink::WebString RtcDataChannelHandler::protocol() const {
DCHECK(thread_checker_.CalledOnValidThread()); DCHECK(thread_checker_.CalledOnValidThread());
return base::UTF8ToUTF16(channel()->protocol()); return blink::WebString::fromUTF8(channel()->protocol());
} }
bool RtcDataChannelHandler::negotiated() const { bool RtcDataChannelHandler::negotiated() const {
...@@ -254,7 +254,7 @@ unsigned long RtcDataChannelHandler::bufferedAmount() { ...@@ -254,7 +254,7 @@ unsigned long RtcDataChannelHandler::bufferedAmount() {
bool RtcDataChannelHandler::sendStringData(const blink::WebString& data) { bool RtcDataChannelHandler::sendStringData(const blink::WebString& data) {
DCHECK(thread_checker_.CalledOnValidThread()); DCHECK(thread_checker_.CalledOnValidThread());
std::string utf8_buffer = base::UTF16ToUTF8(base::StringPiece16(data)); std::string utf8_buffer = data.utf8();
webrtc::DataBuffer data_buffer(utf8_buffer); webrtc::DataBuffer data_buffer(utf8_buffer);
RecordMessageSent(data_buffer.size()); RecordMessageSent(data_buffer.size());
return channel()->Send(data_buffer); return channel()->Send(data_buffer);
...@@ -335,7 +335,7 @@ void RtcDataChannelHandler::OnMessage( ...@@ -335,7 +335,7 @@ void RtcDataChannelHandler::OnMessage(
LOG(ERROR) << "Failed convert received data to UTF16"; LOG(ERROR) << "Failed convert received data to UTF16";
return; return;
} }
webkit_client_->didReceiveStringData(utf16); webkit_client_->didReceiveStringData(blink::WebString::fromUTF16(utf16));
} }
} }
......
...@@ -69,7 +69,7 @@ void RtcDtmfSenderHandler::setClient( ...@@ -69,7 +69,7 @@ void RtcDtmfSenderHandler::setClient(
} }
blink::WebString RtcDtmfSenderHandler::currentToneBuffer() { blink::WebString RtcDtmfSenderHandler::currentToneBuffer() {
return base::UTF8ToUTF16(dtmf_sender_->tones()); return blink::WebString::fromUTF8(dtmf_sender_->tones());
} }
bool RtcDtmfSenderHandler::canInsertDTMF() { bool RtcDtmfSenderHandler::canInsertDTMF() {
...@@ -79,7 +79,7 @@ bool RtcDtmfSenderHandler::canInsertDTMF() { ...@@ -79,7 +79,7 @@ bool RtcDtmfSenderHandler::canInsertDTMF() {
bool RtcDtmfSenderHandler::insertDTMF(const blink::WebString& tones, bool RtcDtmfSenderHandler::insertDTMF(const blink::WebString& tones,
long duration, long duration,
long interToneGap) { long interToneGap) {
std::string utf8_tones = base::UTF16ToUTF8(base::StringPiece16(tones)); std::string utf8_tones = tones.utf8();
return dtmf_sender_->InsertDtmf(utf8_tones, static_cast<int>(duration), return dtmf_sender_->InsertDtmf(utf8_tones, static_cast<int>(duration),
static_cast<int>(interToneGap)); static_cast<int>(interToneGap));
} }
...@@ -89,8 +89,7 @@ void RtcDtmfSenderHandler::OnToneChange(const std::string& tone) { ...@@ -89,8 +89,7 @@ void RtcDtmfSenderHandler::OnToneChange(const std::string& tone) {
LOG(ERROR) << "WebRTCDTMFSenderHandlerClient not set."; LOG(ERROR) << "WebRTCDTMFSenderHandlerClient not set.";
return; return;
} }
webkit_client_->didPlayTone(base::UTF8ToUTF16(tone)); webkit_client_->didPlayTone(blink::WebString::fromUTF8(tone));
} }
} // namespace content } // namespace content
...@@ -138,7 +138,8 @@ GetWebKitSignalingState(webrtc::PeerConnectionInterface::SignalingState state) { ...@@ -138,7 +138,8 @@ GetWebKitSignalingState(webrtc::PeerConnectionInterface::SignalingState state) {
blink::WebRTCSessionDescription CreateWebKitSessionDescription( blink::WebRTCSessionDescription CreateWebKitSessionDescription(
const std::string& sdp, const std::string& type) { const std::string& sdp, const std::string& type) {
blink::WebRTCSessionDescription description; blink::WebRTCSessionDescription description;
description.initialize(base::UTF8ToUTF16(type), base::UTF8ToUTF16(sdp)); description.initialize(blink::WebString::fromUTF8(type),
blink::WebString::fromUTF8(sdp));
return description; return description;
} }
...@@ -200,10 +201,8 @@ void GetNativeRtcConfiguration( ...@@ -200,10 +201,8 @@ void GetNativeRtcConfiguration(
webrtc_config->servers.clear(); webrtc_config->servers.clear();
for (const blink::WebRTCIceServer& blink_server : blink_config.iceServers) { for (const blink::WebRTCIceServer& blink_server : blink_config.iceServers) {
webrtc::PeerConnectionInterface::IceServer server; webrtc::PeerConnectionInterface::IceServer server;
server.username = server.username = blink_server.username.utf8();
base::UTF16ToUTF8(base::StringPiece16(blink_server.username)); server.password = blink_server.credential.utf8();
server.password =
base::UTF16ToUTF8(base::StringPiece16(blink_server.credential));
server.uri = blink_server.url.string().utf8(); server.uri = blink_server.url.string().utf8();
webrtc_config->servers.push_back(server); webrtc_config->servers.push_back(server);
} }
...@@ -389,7 +388,7 @@ class CreateSessionDescriptionRequest ...@@ -389,7 +388,7 @@ class CreateSessionDescriptionRequest
} }
tracker_.TrackOnFailure(error); tracker_.TrackOnFailure(error);
webkit_request_.requestFailed(base::UTF8ToUTF16(error)); webkit_request_.requestFailed(blink::WebString::fromUTF8(error));
webkit_request_.reset(); webkit_request_.reset();
} }
...@@ -442,7 +441,7 @@ class SetSessionDescriptionRequest ...@@ -442,7 +441,7 @@ class SetSessionDescriptionRequest
return; return;
} }
tracker_.TrackOnFailure(error); tracker_.TrackOnFailure(error);
webkit_request_.requestFailed(base::UTF8ToUTF16(error)); webkit_request_.requestFailed(blink::WebString::fromUTF8(error));
webkit_request_.reset(); webkit_request_.reset();
} }
...@@ -1243,9 +1242,8 @@ void RTCPeerConnectionHandler::setLocalDescription( ...@@ -1243,9 +1242,8 @@ void RTCPeerConnectionHandler::setLocalDescription(
DCHECK(thread_checker_.CalledOnValidThread()); DCHECK(thread_checker_.CalledOnValidThread());
TRACE_EVENT0("webrtc", "RTCPeerConnectionHandler::setLocalDescription"); TRACE_EVENT0("webrtc", "RTCPeerConnectionHandler::setLocalDescription");
std::string sdp = base::UTF16ToUTF8(base::StringPiece16(description.sdp())); std::string sdp = description.sdp().utf8();
std::string type = std::string type = description.type().utf8();
base::UTF16ToUTF8(base::StringPiece16(description.type()));
webrtc::SdpParseError error; webrtc::SdpParseError error;
// Since CreateNativeSessionDescription uses the dependency factory, we need // Since CreateNativeSessionDescription uses the dependency factory, we need
...@@ -1297,9 +1295,8 @@ void RTCPeerConnectionHandler::setRemoteDescription( ...@@ -1297,9 +1295,8 @@ void RTCPeerConnectionHandler::setRemoteDescription(
const blink::WebRTCSessionDescription& description) { const blink::WebRTCSessionDescription& description) {
DCHECK(thread_checker_.CalledOnValidThread()); DCHECK(thread_checker_.CalledOnValidThread());
TRACE_EVENT0("webrtc", "RTCPeerConnectionHandler::setRemoteDescription"); TRACE_EVENT0("webrtc", "RTCPeerConnectionHandler::setRemoteDescription");
std::string sdp = base::UTF16ToUTF8(base::StringPiece16(description.sdp())); std::string sdp = description.sdp().utf8();
std::string type = std::string type = description.type().utf8();
base::UTF16ToUTF8(base::StringPiece16(description.type()));
webrtc::SdpParseError error; webrtc::SdpParseError error;
// Since CreateNativeSessionDescription uses the dependency factory, we need // Since CreateNativeSessionDescription uses the dependency factory, we need
...@@ -1427,10 +1424,9 @@ bool RTCPeerConnectionHandler::addICECandidate( ...@@ -1427,10 +1424,9 @@ bool RTCPeerConnectionHandler::addICECandidate(
DCHECK(thread_checker_.CalledOnValidThread()); DCHECK(thread_checker_.CalledOnValidThread());
TRACE_EVENT0("webrtc", "RTCPeerConnectionHandler::addICECandidate"); TRACE_EVENT0("webrtc", "RTCPeerConnectionHandler::addICECandidate");
std::unique_ptr<webrtc::IceCandidateInterface> native_candidate( std::unique_ptr<webrtc::IceCandidateInterface> native_candidate(
dependency_factory_->CreateIceCandidate( dependency_factory_->CreateIceCandidate(candidate.sdpMid().utf8(),
base::UTF16ToUTF8(base::StringPiece16(candidate.sdpMid())), candidate.sdpMLineIndex(),
candidate.sdpMLineIndex(), candidate.candidate().utf8()));
base::UTF16ToUTF8(base::StringPiece16(candidate.candidate()))));
bool return_value = false; bool return_value = false;
if (native_candidate) { if (native_candidate) {
...@@ -1456,7 +1452,7 @@ void RTCPeerConnectionHandler::OnaddICECandidateResult( ...@@ -1456,7 +1452,7 @@ void RTCPeerConnectionHandler::OnaddICECandidateResult(
// We don't have the actual error code from the libjingle, so for now // We don't have the actual error code from the libjingle, so for now
// using a generic error string. // using a generic error string.
return webkit_request.requestFailed( return webkit_request.requestFailed(
base::UTF8ToUTF16("Error processing ICE candidate")); blink::WebString::fromUTF8("Error processing ICE candidate"));
} }
return webkit_request.requestSucceeded(); return webkit_request.requestSucceeded();
...@@ -1608,8 +1604,7 @@ blink::WebRTCDataChannelHandler* RTCPeerConnectionHandler::createDataChannel( ...@@ -1608,8 +1604,7 @@ blink::WebRTCDataChannelHandler* RTCPeerConnectionHandler::createDataChannel(
const blink::WebString& label, const blink::WebRTCDataChannelInit& init) { const blink::WebString& label, const blink::WebRTCDataChannelInit& init) {
DCHECK(thread_checker_.CalledOnValidThread()); DCHECK(thread_checker_.CalledOnValidThread());
TRACE_EVENT0("webrtc", "RTCPeerConnectionHandler::createDataChannel"); TRACE_EVENT0("webrtc", "RTCPeerConnectionHandler::createDataChannel");
DVLOG(1) << "createDataChannel label " DVLOG(1) << "createDataChannel label " << label.utf8();
<< base::UTF16ToUTF8(base::StringPiece16(label));
webrtc::DataChannelInit config; webrtc::DataChannelInit config;
// TODO(jiayl): remove the deprecated reliable field once Libjingle is updated // TODO(jiayl): remove the deprecated reliable field once Libjingle is updated
...@@ -1620,11 +1615,10 @@ blink::WebRTCDataChannelHandler* RTCPeerConnectionHandler::createDataChannel( ...@@ -1620,11 +1615,10 @@ blink::WebRTCDataChannelHandler* RTCPeerConnectionHandler::createDataChannel(
config.negotiated = init.negotiated; config.negotiated = init.negotiated;
config.maxRetransmits = init.maxRetransmits; config.maxRetransmits = init.maxRetransmits;
config.maxRetransmitTime = init.maxRetransmitTime; config.maxRetransmitTime = init.maxRetransmitTime;
config.protocol = base::UTF16ToUTF8(base::StringPiece16(init.protocol)); config.protocol = init.protocol.utf8();
rtc::scoped_refptr<webrtc::DataChannelInterface> webrtc_channel( rtc::scoped_refptr<webrtc::DataChannelInterface> webrtc_channel(
native_peer_connection_->CreateDataChannel( native_peer_connection_->CreateDataChannel(label.utf8(), &config));
base::UTF16ToUTF8(base::StringPiece16(label)), &config));
if (!webrtc_channel) { if (!webrtc_channel) {
DLOG(ERROR) << "Could not create native data channel."; DLOG(ERROR) << "Could not create native data channel.";
return NULL; return NULL;
...@@ -1853,8 +1847,8 @@ void RTCPeerConnectionHandler::OnIceCandidate( ...@@ -1853,8 +1847,8 @@ void RTCPeerConnectionHandler::OnIceCandidate(
DCHECK(thread_checker_.CalledOnValidThread()); DCHECK(thread_checker_.CalledOnValidThread());
TRACE_EVENT0("webrtc", "RTCPeerConnectionHandler::OnIceCandidateImpl"); TRACE_EVENT0("webrtc", "RTCPeerConnectionHandler::OnIceCandidateImpl");
blink::WebRTCICECandidate web_candidate; blink::WebRTCICECandidate web_candidate;
web_candidate.initialize(base::UTF8ToUTF16(sdp), web_candidate.initialize(blink::WebString::fromUTF8(sdp),
base::UTF8ToUTF16(sdp_mid), blink::WebString::fromUTF8(sdp_mid),
sdp_mline_index); sdp_mline_index);
if (peer_connection_tracker_) { if (peer_connection_tracker_) {
peer_connection_tracker_->TrackAddIceCandidate( peer_connection_tracker_->TrackAddIceCandidate(
......
...@@ -443,7 +443,7 @@ void UserMediaClientImpl::OnStreamGenerated( ...@@ -443,7 +443,7 @@ void UserMediaClientImpl::OnStreamGenerated(
CreateVideoTracks(video_array, request_info->request.videoConstraints(), CreateVideoTracks(video_array, request_info->request.videoConstraints(),
&video_track_vector, request_info); &video_track_vector, request_info);
blink::WebString webkit_id = base::UTF8ToUTF16(label); blink::WebString webkit_id = blink::WebString::fromUTF8(label);
blink::WebMediaStream* web_stream = &(request_info->web_stream); blink::WebMediaStream* web_stream = &(request_info->web_stream);
web_stream->initialize(webkit_id, audio_track_vector, web_stream->initialize(webkit_id, audio_track_vector,
...@@ -554,11 +554,9 @@ void UserMediaClientImpl::InitializeSourceObject( ...@@ -554,11 +554,9 @@ void UserMediaClientImpl::InitializeSourceObject(
return; return;
} }
webkit_source->initialize( webkit_source->initialize(blink::WebString::fromUTF8(device.device.id), type,
base::UTF8ToUTF16(device.device.id), blink::WebString::fromUTF8(device.device.name),
type, false /* remote */);
base::UTF8ToUTF16(device.device.name),
false /* remote */);
DVLOG(1) << "Initialize source object :" DVLOG(1) << "Initialize source object :"
<< "id = " << webkit_source->id().utf8() << "id = " << webkit_source->id().utf8()
......
...@@ -400,8 +400,8 @@ bool KeySystemConfigSelector::GetSupportedCapabilities( ...@@ -400,8 +400,8 @@ bool KeySystemConfigSelector::GetSupportedCapabilities(
// 3.4-3.11. (Implemented by IsSupportedContentType().) // 3.4-3.11. (Implemented by IsSupportedContentType().)
ConfigState proposed_config_state = *config_state; ConfigState proposed_config_state = *config_state;
if (!base::IsStringASCII(capability.mimeType) || if (!capability.mimeType.containsOnlyASCII() ||
!base::IsStringASCII(capability.codecs) || !capability.codecs.containsOnlyASCII() ||
!IsSupportedContentType( !IsSupportedContentType(
key_system, media_type, capability.mimeType.ascii(), key_system, media_type, capability.mimeType.ascii(),
capability.codecs.ascii(), &proposed_config_state)) { capability.codecs.ascii(), &proposed_config_state)) {
...@@ -412,7 +412,7 @@ bool KeySystemConfigSelector::GetSupportedCapabilities( ...@@ -412,7 +412,7 @@ bool KeySystemConfigSelector::GetSupportedCapabilities(
// 3.12.1. If robustness is an unrecognized value or not supported by // 3.12.1. If robustness is an unrecognized value or not supported by
// implementation, continue to the next iteration. String // implementation, continue to the next iteration. String
// comparison is case-sensitive. // comparison is case-sensitive.
if (!base::IsStringASCII(capability.robustness)) if (!capability.robustness.containsOnlyASCII())
continue; continue;
EmeConfigRule robustness_rule = key_systems_->GetRobustnessConfigRule( EmeConfigRule robustness_rule = key_systems_->GetRobustnessConfigRule(
key_system, media_type, capability.robustness.ascii()); key_system, media_type, capability.robustness.ascii());
......
...@@ -128,8 +128,9 @@ void WebEncryptedMediaClientImpl::CreateCdm( ...@@ -128,8 +128,9 @@ void WebEncryptedMediaClientImpl::CreateCdm(
const blink::WebSecurityOrigin& security_origin, const blink::WebSecurityOrigin& security_origin,
const CdmConfig& cdm_config, const CdmConfig& cdm_config,
std::unique_ptr<blink::WebContentDecryptionModuleResult> result) { std::unique_ptr<blink::WebContentDecryptionModuleResult> result) {
WebContentDecryptionModuleImpl::Create( WebContentDecryptionModuleImpl::Create(cdm_factory_, key_system.utf16(),
cdm_factory_, key_system, security_origin, cdm_config, std::move(result)); security_origin, cdm_config,
std::move(result));
} }
void WebEncryptedMediaClientImpl::OnRequestSucceeded( void WebEncryptedMediaClientImpl::OnRequestSucceeded(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment