Relanding PacketOptions CL after revert

content/common/p2p_messages.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // IPC messages for the P2P Transport API.
 // Multiply-included message file, hence no include guard.
 
 #include "base/time/time.h"
 #include "content/common/content_export.h"
 #include "content/common/p2p_socket_type.h"
 #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
 #define IPC_MESSAGE_START P2PMsgStart
 
 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,
                      net::NetworkInterfaceList /* networks */)
 
 IPC_MESSAGE_CONTROL2(P2PMsg_GetHostAddressResult,
                      int32 /* request_id */,
                      net::IPAddressList /* address list*/)
 
 IPC_MESSAGE_CONTROL2(P2PMsg_OnSocketCreated,
@@ skipping 36 matching lines @@
 IPC_MESSAGE_CONTROL3(P2PHostMsg_AcceptIncomingTcpConnection,
                     int /* listen_socket_id */,
                     net::IPEndPoint /* remote_address */,
                     int /* connected_socket_id */)
 
 // TODO(sergeyu): Use shared memory to pass the data.
 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,
                      int /* socket_id */)
 
 IPC_MESSAGE_CONTROL3(P2PHostMsg_SetOption,
                      int /* socket_id */,
                      content::P2PSocketOption /* socket option type */,
                      int /* value */)