diff options
| author | bartfab@chromium.org <bartfab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-24 11:18:02 +0000 |
|---|---|---|
| committer | bartfab@chromium.org <bartfab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-24 11:18:02 +0000 |
| commit | 4f1ac21313c9a738e9db211766ad652c8c3844e5 (patch) | |
| tree | fc9424d48f988af2d778db871079ab584eb1030d /content/common/p2p_messages.h | |
| parent | fa0dded26a56aa2c62abaadb2978ed83de5c186e (diff) | |
| download | chromium_src-4f1ac21313c9a738e9db211766ad652c8c3844e5.zip chromium_src-4f1ac21313c9a738e9db211766ad652c8c3844e5.tar.gz chromium_src-4f1ac21313c9a738e9db211766ad652c8c3844e5.tar.bz2 | |
Revert 252408 "Adding talk_base::PacketOptions to P2P IPC Send m..."
This made the ASAN bots fail:
http://build.chromium.org/p/chromium.lkgr/builders/ASAN%20Release/builds/7563
> Adding talk_base::PacketOptions to P2P IPC Send message.
>
> Libjingle added a structure which will carry additional
> meta information about the packet in Send API. This includes
> DSCP code for the packet and packet authentication information.
> This information must be used before the packet is sent over
> the network. This requires options must be sent to the browser process.
>
> R=sergeyu@chromium.org
> TBR=cevans@chromium.org,avi@chromium.org
>
> BUG=
>
> Review URL: https://codereview.chromium.org/170193002
TBR=mallinath@chromium.org
Review URL: https://codereview.chromium.org/177603002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@252900 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common/p2p_messages.h')
| -rw-r--r-- | content/common/p2p_messages.h | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/content/common/p2p_messages.h b/content/common/p2p_messages.h index db081e6..814adc1 100644 --- a/content/common/p2p_messages.h +++ b/content/common/p2p_messages.h @@ -11,7 +11,6 @@ #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 @@ -21,28 +20,15 @@ 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(talk_base::DiffServCodePoint, - talk_base::DSCP_NO_CHANGE, - talk_base::DSCP_CS7) +IPC_ENUM_TRAITS_MIN_MAX_VALUE(net::DiffServCodePoint, + net::DSCP_FIRST, + net::DSCP_LAST) 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_MEMBER(payload_len) -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, @@ -99,7 +85,7 @@ IPC_MESSAGE_CONTROL5(P2PHostMsg_Send, int /* socket_id */, net::IPEndPoint /* socket_address */, std::vector<char> /* data */, - talk_base::PacketOptions /* dscp */, + net::DiffServCodePoint /* dscp */, uint64 /* packet_id */) IPC_MESSAGE_CONTROL1(P2PHostMsg_DestroySocket, |