Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(450)

Unified Diff: jingle/glue/channel_socket_adapter.cc

Issue 429113002: Webrtc deps roll. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Use webrtc version 6825 and rebase and switch back to original workspace. Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « jingle/glue/channel_socket_adapter.h ('k') | jingle/glue/channel_socket_adapter_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: jingle/glue/channel_socket_adapter.cc
diff --git a/jingle/glue/channel_socket_adapter.cc b/jingle/glue/channel_socket_adapter.cc
index bca4222aaeb0421d079c8de099137a22c8f516b5..1645f96bdfb304043c3c01a9bbd480a45ae3d5c6 100644
--- a/jingle/glue/channel_socket_adapter.cc
+++ b/jingle/glue/channel_socket_adapter.cc
@@ -76,7 +76,7 @@ int TransportChannelSocketAdapter::Write(
}
int result;
- talk_base::PacketOptions options;
+ rtc::PacketOptions options;
if (channel_->writable()) {
result = channel_->SendPacket(buffer->data(), buffer_size, options);
if (result < 0) {
@@ -101,13 +101,13 @@ int TransportChannelSocketAdapter::Write(
int TransportChannelSocketAdapter::SetReceiveBufferSize(int32 size) {
DCHECK_EQ(base::MessageLoop::current(), message_loop_);
- return (channel_->SetOption(talk_base::Socket::OPT_RCVBUF, size) == 0) ?
+ return (channel_->SetOption(rtc::Socket::OPT_RCVBUF, size) == 0) ?
net::OK : net::ERR_SOCKET_SET_RECEIVE_BUFFER_SIZE_ERROR;
}
int TransportChannelSocketAdapter::SetSendBufferSize(int32 size) {
DCHECK_EQ(base::MessageLoop::current(), message_loop_);
- return (channel_->SetOption(talk_base::Socket::OPT_SNDBUF, size) == 0) ?
+ return (channel_->SetOption(rtc::Socket::OPT_SNDBUF, size) == 0) ?
net::OK : net::ERR_SOCKET_SET_SEND_BUFFER_SIZE_ERROR;
}
@@ -142,7 +142,7 @@ void TransportChannelSocketAdapter::OnNewPacket(
cricket::TransportChannel* channel,
const char* data,
size_t data_size,
- const talk_base::PacketTime& packet_time,
+ const rtc::PacketTime& packet_time,
int flags) {
DCHECK_EQ(base::MessageLoop::current(), message_loop_);
DCHECK_EQ(channel, channel_);
@@ -174,7 +174,7 @@ void TransportChannelSocketAdapter::OnWritableState(
DCHECK_EQ(base::MessageLoop::current(), message_loop_);
// Try to send the packet if there is a pending write.
if (!write_callback_.is_null()) {
- talk_base::PacketOptions options;
+ rtc::PacketOptions options;
int result = channel_->SendPacket(write_buffer_->data(),
write_buffer_size_,
options);
« no previous file with comments | « jingle/glue/channel_socket_adapter.h ('k') | jingle/glue/channel_socket_adapter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698