content/browser/renderer_host/p2p/socket_dispatcher_host.cc - 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/browser/renderer_host/p2p/socket_dispatcher_host.cc

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:

Index: content/browser/renderer_host/p2p/socket_dispatcher_host.cc

diff --git a/content/browser/renderer_host/p2p/socket_dispatcher_host.cc b/content/browser/renderer_host/p2p/socket_dispatcher_host.cc

index bb8c1fb9610a4aa8e185a940a3ca3b88ff947b74..8bab6aff97621bdaa3bf329dac834ee01540a40d 100644

--- a/content/browser/renderer_host/p2p/socket_dispatcher_host.cc

+++ b/content/browser/renderer_host/p2p/socket_dispatcher_host.cc

@@ -269,7 +269,7 @@ void P2PSocketDispatcherHost::OnAcceptIncomingTcpConnection(

void P2PSocketDispatcherHost::OnSend(int socket_id,

const net::IPEndPoint& socket_address,

const std::vector<char>& data,

- const talk_base::PacketOptions& options,

+ const rtc::PacketOptions& options,

uint64 packet_id) {

P2PSocketHost* socket = LookupSocket(socket_id);

if (!socket) {