diff options
Diffstat (limited to 'remoting/client/plugin/pepper_port_allocator.cc')
| -rw-r--r-- | remoting/client/plugin/pepper_port_allocator.cc | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/remoting/client/plugin/pepper_port_allocator.cc b/remoting/client/plugin/pepper_port_allocator.cc index 62a5822..423102a 100644 --- a/remoting/client/plugin/pepper_port_allocator.cc +++ b/remoting/client/plugin/pepper_port_allocator.cc @@ -82,9 +82,15 @@ PepperPortAllocatorSession::PepperPortAllocatorSession( const std::vector<std::string>& relay_hosts, const std::string& relay_token, const pp::InstanceHandle& instance) - : HttpPortAllocatorSessionBase( - allocator, content_name, component, ice_username_fragment, ice_password, - stun_hosts, relay_hosts, relay_token, ""), + : HttpPortAllocatorSessionBase(allocator, + content_name, + component, + ice_username_fragment, + ice_password, + stun_hosts, + relay_hosts, + relay_token, + std::string()), instance_(instance), stun_address_resolver_(instance_), stun_port_(0), @@ -129,7 +135,7 @@ void PepperPortAllocatorSession::GetPortConfigurations() { // Add an empty configuration synchronously, so a local connection // can be started immediately. ConfigReady(new cricket::PortConfiguration( - talk_base::SocketAddress(), "", "")); + talk_base::SocketAddress(), std::string(), std::string())); ResolveStunServerAddress(); TryCreateRelaySession(); @@ -195,7 +201,8 @@ void PepperPortAllocatorSession::OnStunAddressResolved(int32_t result) { ReceiveSessionResponse(std::string(relay_response_body_.begin(), relay_response_body_.end())); } else { - ConfigReady(new cricket::PortConfiguration(stun_address_, "", "")); + ConfigReady(new cricket::PortConfiguration( + stun_address_, std::string(), std::string())); } } @@ -304,7 +311,9 @@ PepperPortAllocator::PepperPortAllocator( const pp::InstanceHandle& instance, scoped_ptr<talk_base::NetworkManager> network_manager, scoped_ptr<talk_base::PacketSocketFactory> socket_factory) - : HttpPortAllocatorBase(network_manager.get(), socket_factory.get(), ""), + : HttpPortAllocatorBase(network_manager.get(), + socket_factory.get(), + std::string()), instance_(instance), network_manager_(network_manager.Pass()), socket_factory_(socket_factory.Pass()) { |