content/renderer/p2p/port_allocator.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/renderer/p2p/port_allocator.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:

Index: content/renderer/p2p/port_allocator.h

diff --git a/content/renderer/p2p/port_allocator.h b/content/renderer/p2p/port_allocator.h

index 8ff20a546f00e4cab3bee5ab9f1f8b7959a1dbfe..258d7856733af49e06bff0adf04f17000d984d60 100644

--- a/content/renderer/p2p/port_allocator.h

+++ b/content/renderer/p2p/port_allocator.h

@@ -56,8 +56,8 @@ class P2PPortAllocator : public cricket::BasicPortAllocator {

P2PPortAllocator(blink::WebFrame* web_frame,

P2PSocketDispatcher* socket_dispatcher,

- talk_base::NetworkManager* network_manager,

- talk_base::PacketSocketFactory* socket_factory,

+ rtc::NetworkManager* network_manager,

+ rtc::PacketSocketFactory* socket_factory,

const Config& config);

virtual ~P2PPortAllocator();

@@ -115,7 +115,7 @@ class P2PPortAllocatorSession : public cricket::BasicPortAllocatorSession,

scoped_ptr<blink::WebURLLoader> relay_session_request_;

int relay_session_attempts_;

std::string relay_session_response_;

- talk_base::SocketAddress relay_ip_;

+ rtc::SocketAddress relay_ip_;

int relay_udp_port_;

int relay_tcp_port_;

int relay_ssltcp_port_;

« no previous file with comments | « content/renderer/p2p/ipc_socket_factory.cc ('k') | content/renderer/p2p/port_allocator.cc » ('j') | no next file with comments »