Roll webrtc to r5549.

remoting/jingle_glue/chromium_socket_factory.cc

Index: remoting/jingle_glue/chromium_socket_factory.cc
===================================================================
--- remoting/jingle_glue/chromium_socket_factory.cc	(revision 251546)
+++ remoting/jingle_glue/chromium_socket_factory.cc	(working copy)
@@ -47,10 +47,10 @@
   virtual talk_base::SocketAddress GetLocalAddress() const OVERRIDE;
   virtual talk_base::SocketAddress GetRemoteAddress() const OVERRIDE;
   virtual int Send(const void* data, size_t data_size,
-                   talk_base::DiffServCodePoint dscp) OVERRIDE;
+                   const talk_base::PacketOptions& options) OVERRIDE;
   virtual int SendTo(const void* data, size_t data_size,
                      const talk_base::SocketAddress& address,
-                     talk_base::DiffServCodePoint dscp) OVERRIDE;
+                     const talk_base::PacketOptions& options) OVERRIDE;
   virtual int Close() OVERRIDE;
   virtual State GetState() const OVERRIDE;
   virtual int GetOption(talk_base::Socket::Option option, int* value) OVERRIDE;
@@ -163,7 +163,7 @@
 }
 
 int UdpPacketSocket::Send(const void* data, size_t data_size,
-                          talk_base::DiffServCodePoint dscp) {
+                          const talk_base::PacketOptions& options) {
   // UDP sockets are not connected - this method should never be called.
   NOTREACHED();
   return EWOULDBLOCK;
@@ -171,7 +171,7 @@
 
 int UdpPacketSocket::SendTo(const void* data, size_t data_size,
                             const talk_base::SocketAddress& address,
-                            talk_base::DiffServCodePoint dscp) {
+                            const talk_base::PacketOptions& options) {
   if (state_ != STATE_BOUND) {
     NOTREACHED();
     return EINVAL;