content/common/p2p_messages.h - Issue 429113002: Webrtc deps roll.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/common/p2p_messages.h

Issue 429113002: Webrtc deps roll. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Use webrtc version 6825 and rebase and switch back to original workspace. Created 6 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/renderer_host/p2p/socket_host_unittest.cc ('k') | content/renderer/media/media_stream_audio_processor_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/common/p2p_messages.h

diff --git a/content/common/p2p_messages.h b/content/common/p2p_messages.h

index 26846ddcef70664c1b735024d4c93ee2776f5aea..d01807fe9af70ea0268a596efd20193b75199ee2 100644

--- a/content/common/p2p_messages.h

+++ b/content/common/p2p_messages.h

@@ -10,7 +10,7 @@

#include "content/common/p2p_socket_type.h"

#include "ipc/ipc_message_macros.h"

#include "net/base/net_util.h"

-#include "third_party/libjingle/source/talk/base/asyncpacketsocket.h"

+#include "third_party/webrtc/base/asyncpacketsocket.h"

#undef IPC_MESSAGE_EXPORT

#define IPC_MESSAGE_EXPORT CONTENT_EXPORT

@@ -20,9 +20,9 @@ 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(rtc::DiffServCodePoint,

+ rtc::DSCP_NO_CHANGE,

+ rtc::DSCP_CS7)

IPC_STRUCT_TRAITS_BEGIN(net::NetworkInterface)

IPC_STRUCT_TRAITS_MEMBER(name)

@@ -30,14 +30,14 @@ IPC_STRUCT_TRAITS_BEGIN(net::NetworkInterface)

IPC_STRUCT_TRAITS_MEMBER(address)

IPC_STRUCT_TRAITS_END()

-IPC_STRUCT_TRAITS_BEGIN(talk_base::PacketTimeUpdateParams)

+IPC_STRUCT_TRAITS_BEGIN(rtc::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_BEGIN(rtc::PacketOptions)

IPC_STRUCT_TRAITS_MEMBER(dscp)

IPC_STRUCT_TRAITS_MEMBER(packet_time_params)

IPC_STRUCT_TRAITS_END()

@@ -104,7 +104,7 @@ IPC_MESSAGE_CONTROL5(P2PHostMsg_Send,

int /* socket_id */,

net::IPEndPoint /* socket_address */,

std::vector<char> /* data */,

- talk_base::PacketOptions /* packet options */,

+ rtc::PacketOptions /* packet options */,

uint64 /* packet_id */)

IPC_MESSAGE_CONTROL1(P2PHostMsg_DestroySocket,