Relanding PacketOptions CL after revert

content/common/p2p_messages.h

Index: content/common/p2p_messages.h
diff --git a/content/common/p2p_messages.h b/content/common/p2p_messages.h
index f221544551ebbc3e1a316c45ab1db0bad5080992..2394d8d243c5771c6d70d4e3fc3f450895c69002 100644
--- a/content/common/p2p_messages.h
+++ b/content/common/p2p_messages.h
@@ -11,6 +11,7 @@
 #include "ipc/ipc_message_macros.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/net_util.h"
+#include "third_party/libjingle/source/talk/base/asyncpacketsocket.h"
 
 #undef IPC_MESSAGE_EXPORT
 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT
@@ -20,15 +21,27 @@ IPC_ENUM_TRAITS_MAX_VALUE(content::P2PSocketType,
                           content::P2P_SOCKET_TYPE_LAST)
 IPC_ENUM_TRAITS_MAX_VALUE(content::P2PSocketOption,
                           content::P2P_SOCKET_OPT_MAX - 1)
-IPC_ENUM_TRAITS_MIN_MAX_VALUE(net::DiffServCodePoint,
-                              net::DSCP_FIRST,
-                              net::DSCP_LAST)
+IPC_ENUM_TRAITS_MIN_MAX_VALUE(talk_base::DiffServCodePoint,
+                              talk_base::DSCP_NO_CHANGE,
+                              talk_base::DSCP_CS7)
 
 IPC_STRUCT_TRAITS_BEGIN(net::NetworkInterface)
   IPC_STRUCT_TRAITS_MEMBER(name)
   IPC_STRUCT_TRAITS_MEMBER(address)
 IPC_STRUCT_TRAITS_END()
 
+IPC_STRUCT_TRAITS_BEGIN(talk_base::PacketTimeUpdateParams)
+  IPC_STRUCT_TRAITS_MEMBER(rtp_sendtime_extension_id)
+  IPC_STRUCT_TRAITS_MEMBER(srtp_auth_key)
+  IPC_STRUCT_TRAITS_MEMBER(srtp_auth_tag_len)
+  IPC_STRUCT_TRAITS_MEMBER(srtp_packet_index)
+IPC_STRUCT_TRAITS_END()
+
+IPC_STRUCT_TRAITS_BEGIN(talk_base::PacketOptions)
+  IPC_STRUCT_TRAITS_MEMBER(dscp)
+  IPC_STRUCT_TRAITS_MEMBER(packet_time_params)
+IPC_STRUCT_TRAITS_END()
+
 // P2P Socket messages sent from the browser to the renderer.
 
 IPC_MESSAGE_CONTROL1(P2PMsg_NetworkListChanged,
@@ -85,7 +98,7 @@ IPC_MESSAGE_CONTROL5(P2PHostMsg_Send,
                      int /* socket_id */,
                      net::IPEndPoint /* socket_address */,
                      std::vector<char> /* data */,
-                     net::DiffServCodePoint /* dscp */,
+                     talk_base::PacketOptions /* packet options */,
                      uint64 /* packet_id */)
 
 IPC_MESSAGE_CONTROL1(P2PHostMsg_DestroySocket,