Roll webrtc to r5549.

content/renderer/p2p/ipc_socket_factory.cc

Index: content/renderer/p2p/ipc_socket_factory.cc
===================================================================
--- content/renderer/p2p/ipc_socket_factory.cc	(revision 251546)
+++ content/renderer/p2p/ipc_socket_factory.cc	(working copy)
@@ -78,10 +78,10 @@
   virtual talk_base::SocketAddress GetLocalAddress() const OVERRIDE;
   virtual talk_base::SocketAddress GetRemoteAddress() const OVERRIDE;
   virtual int Send(const void *pv, size_t cb,
-                   talk_base::DiffServCodePoint dscp) OVERRIDE;
+                   const talk_base::PacketOptions& options) OVERRIDE;
   virtual int SendTo(const void *pv, size_t cb,
                      const talk_base::SocketAddress& addr,
-                     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;
@@ -243,14 +243,14 @@
 }
 
 int IpcPacketSocket::Send(const void *data, size_t data_size,
-                          talk_base::DiffServCodePoint dscp) {
+                          const talk_base::PacketOptions& options) {
   DCHECK_EQ(base::MessageLoop::current(), message_loop_);
-  return SendTo(data, data_size, remote_address_, dscp);
+  return SendTo(data, data_size, remote_address_, options);
 }
 
 int IpcPacketSocket::SendTo(const void *data, size_t data_size,
                             const talk_base::SocketAddress& address,
-                            talk_base::DiffServCodePoint dscp) {
+                            const talk_base::PacketOptions& options) {
   DCHECK_EQ(base::MessageLoop::current(), message_loop_);
 
   switch (state_) {
@@ -297,7 +297,7 @@
   const char* data_char = reinterpret_cast<const char*>(data);
   std::vector<char> data_vector(data_char, data_char + data_size);
   client_->SendWithDscp(address_chrome, data_vector,
-                        static_cast<net::DiffServCodePoint>(dscp));
+                        static_cast<net::DiffServCodePoint>(options.dscp));
 
   // Fake successful send. The caller ignores result anyway.
   return data_size;