Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(744)

Unified Diff: content/renderer/p2p/port_allocator.cc

Issue 450463002: Update webrtc&libjingle 6774:6825. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: 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/renderer/p2p/port_allocator.h ('k') | content/renderer/p2p/socket_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/p2p/port_allocator.cc
===================================================================
--- content/renderer/p2p/port_allocator.cc (revision 287594)
+++ content/renderer/p2p/port_allocator.cc (working copy)
@@ -69,8 +69,8 @@
P2PPortAllocator::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)
: cricket::BasicPortAllocator(network_manager, socket_factory),
web_frame_(web_frame),
@@ -259,7 +259,7 @@
void P2PPortAllocatorSession::AddConfig() {
const P2PPortAllocator::Config& config = allocator_->config_;
cricket::PortConfiguration* port_config = new cricket::PortConfiguration(
- talk_base::SocketAddress(config.stun_server, config.stun_server_port),
+ rtc::SocketAddress(config.stun_server, config.stun_server_port),
std::string(), std::string());
for (size_t i = 0; i < config.relays.size(); ++i) {
@@ -278,7 +278,7 @@
}
relay_server.ports.push_back(cricket::ProtocolAddress(
- talk_base::SocketAddress(config.relays[i].server_address,
+ rtc::SocketAddress(config.relays[i].server_address,
config.relays[i].port),
protocol,
config.relays[i].secure));
« no previous file with comments | « content/renderer/p2p/port_allocator.h ('k') | content/renderer/p2p/socket_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698