Roll webrtc to r5549.

jingle/glue/channel_socket_adapter.cc

Index: jingle/glue/channel_socket_adapter.cc
===================================================================
--- jingle/glue/channel_socket_adapter.cc	(revision 251438)
+++ jingle/glue/channel_socket_adapter.cc	(working copy)
@@ -76,9 +76,9 @@
   }
 
   int result;
+  talk_base::PacketOptions options;

[Sergey Ulanov, 2014/02/15 00:12:28]

move this inside of the if block

   if (channel_->writable()) {
-    result = channel_->SendPacket(buffer->data(), buffer_size,
-                                  talk_base::DSCP_NO_CHANGE);
+    result = channel_->SendPacket(buffer->data(), buffer_size, options);
     if (result < 0) {
       result = net::MapSystemError(channel_->GetError());
 
@@ -172,9 +172,10 @@
   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;
     int result = channel_->SendPacket(write_buffer_->data(),
                                       write_buffer_size_,
-                                      talk_base::DSCP_NO_CHANGE);
+                                      options);
     if (result < 0)
       result = net::MapSystemError(channel_->GetError());