| Index: content/renderer/media/rtc_data_channel_handler.cc
|
| diff --git a/content/renderer/media/rtc_data_channel_handler.cc b/content/renderer/media/rtc_data_channel_handler.cc
|
| index 713dc4cf8b8c0530e1f469e9c44ccb863d2a97ce..3cd9a37222d51d3434e8d5ab1ac7988e182cbec5 100644
|
| --- a/content/renderer/media/rtc_data_channel_handler.cc
|
| +++ b/content/renderer/media/rtc_data_channel_handler.cc
|
| @@ -25,11 +25,11 @@ RtcDataChannelHandler::~RtcDataChannelHandler() {
|
| }
|
|
|
| void RtcDataChannelHandler::setClient(
|
| - WebKit::WebRTCDataChannelHandlerClient* client) {
|
| + blink::WebRTCDataChannelHandlerClient* client) {
|
| webkit_client_ = client;
|
| }
|
|
|
| -WebKit::WebString RtcDataChannelHandler::label() {
|
| +blink::WebString RtcDataChannelHandler::label() {
|
| return UTF8ToUTF16(channel_->label());
|
| }
|
|
|
| @@ -49,7 +49,7 @@ unsigned short RtcDataChannelHandler::maxRetransmits() const {
|
| return channel_->maxRetransmits();
|
| }
|
|
|
| -WebKit::WebString RtcDataChannelHandler::protocol() const {
|
| +blink::WebString RtcDataChannelHandler::protocol() const {
|
| return UTF8ToUTF16(channel_->protocol());
|
| }
|
|
|
| @@ -65,7 +65,7 @@ unsigned long RtcDataChannelHandler::bufferedAmount() {
|
| return channel_->buffered_amount();
|
| }
|
|
|
| -bool RtcDataChannelHandler::sendStringData(const WebKit::WebString& data) {
|
| +bool RtcDataChannelHandler::sendStringData(const blink::WebString& data) {
|
| std::string utf8_buffer = UTF16ToUTF8(data);
|
| talk_base::Buffer buffer(utf8_buffer.c_str(), utf8_buffer.length());
|
| webrtc::DataBuffer data_buffer(buffer, false);
|
| @@ -91,19 +91,19 @@ void RtcDataChannelHandler::OnStateChange() {
|
| switch (channel_->state()) {
|
| case webrtc::DataChannelInterface::kConnecting:
|
| webkit_client_->didChangeReadyState(
|
| - WebKit::WebRTCDataChannelHandlerClient::ReadyStateConnecting);
|
| + blink::WebRTCDataChannelHandlerClient::ReadyStateConnecting);
|
| break;
|
| case webrtc::DataChannelInterface::kOpen:
|
| webkit_client_->didChangeReadyState(
|
| - WebKit::WebRTCDataChannelHandlerClient::ReadyStateOpen);
|
| + blink::WebRTCDataChannelHandlerClient::ReadyStateOpen);
|
| break;
|
| case webrtc::DataChannelInterface::kClosing:
|
| webkit_client_->didChangeReadyState(
|
| - WebKit::WebRTCDataChannelHandlerClient::ReadyStateClosing);
|
| + blink::WebRTCDataChannelHandlerClient::ReadyStateClosing);
|
| break;
|
| case webrtc::DataChannelInterface::kClosed:
|
| webkit_client_->didChangeReadyState(
|
| - WebKit::WebRTCDataChannelHandlerClient::ReadyStateClosed);
|
| + blink::WebRTCDataChannelHandlerClient::ReadyStateClosed);
|
| break;
|
| default:
|
| NOTREACHED();
|
|
|