Relanding PacketOptions CL after revert

content/browser/renderer_host/p2p/socket_host_udp.h

Index: content/browser/renderer_host/p2p/socket_host_udp.h
diff --git a/content/browser/renderer_host/p2p/socket_host_udp.h b/content/browser/renderer_host/p2p/socket_host_udp.h
index 7c8bbb2c2bdb69548a2fc184b5c0bcc38f4a8f65..fc7b6f1e2ebc00d733ddefe3979c3393486ca2a6 100644
--- a/content/browser/renderer_host/p2p/socket_host_udp.h
+++ b/content/browser/renderer_host/p2p/socket_host_udp.h
@@ -18,6 +18,7 @@
 #include "content/common/p2p_socket_type.h"
 #include "net/base/ip_endpoint.h"
 #include "net/udp/udp_server_socket.h"
+#include "third_party/libjingle/source/talk/base/asyncpacketsocket.h"
 
 namespace content {
 
@@ -34,7 +35,7 @@ class CONTENT_EXPORT P2PSocketHostUdp : public P2PSocketHost {
                     const net::IPEndPoint& remote_address) OVERRIDE;
   virtual void Send(const net::IPEndPoint& to,
                     const std::vector<char>& data,
-                    net::DiffServCodePoint dscp,
+                    const talk_base::PacketOptions& options,
                     uint64 packet_id) OVERRIDE;
   virtual P2PSocketHost* AcceptIncomingTcpConnection(
       const net::IPEndPoint& remote_address, int id) OVERRIDE;
@@ -48,13 +49,13 @@ class CONTENT_EXPORT P2PSocketHostUdp : public P2PSocketHost {
   struct PendingPacket {
     PendingPacket(const net::IPEndPoint& to,
                   const std::vector<char>& content,
-                  net::DiffServCodePoint dscp,
+                  const talk_base::PacketOptions& options,
                   uint64 id);
     ~PendingPacket();
     net::IPEndPoint to;
     scoped_refptr<net::IOBuffer> data;
     int size;
-    net::DiffServCodePoint dscp;
+    talk_base::PacketOptions packet_options;
     uint64 id;
   };