libjingle roll r175

remoting/client/plugin/pepper_port_allocator.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/client/plugin/pepper_port_allocator.h"
 
 #include "base/string_number_conversions.h"
 #include "net/base/net_util.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/cpp/completion_callback.h"
@@ skipping 110 matching lines @@
       }
     }
     relay->ports = filtered_ports;
   }
   cricket::BasicPortAllocatorSession::ConfigReady(config);
 }
 
 void PepperPortAllocatorSession::GetPortConfigurations() {
   // Add an empty configuration synchronously, so a local connection
   // can be started immediately.
-  ConfigReady(new cricket::PortConfiguration(talk_base::SocketAddress()));
+  ConfigReady(new cricket::PortConfiguration(
+      talk_base::SocketAddress(), "", ""));
 
   ResolveStunServerAddress();
   TryCreateRelaySession();
 }
 
 void PepperPortAllocatorSession::ResolveStunServerAddress() {
   if (stun_address_.IsNil()) {
     return;
   }
 
@@ skipping 42 matching lines @@
     // and Relay parameters are stored together in PortConfiguration
     // and ReceiveSessionResponse() doesn't save relay session
     // configuration for the case we resolve STUN address later. This
     // method invokes overriden ConfigReady() which then submits
     // resolved |stun_address_|.
     //
     // TODO(sergeyu): Refactor HttpPortAllocatorSessionBase to fix this.
     ReceiveSessionResponse(std::string(relay_response_body_.begin(),
                                        relay_response_body_.end()));
   } else {
-    ConfigReady(new cricket::PortConfiguration(stun_address_));
+    ConfigReady(new cricket::PortConfiguration(stun_address_, "", ""));
   }
 }
 
 void PepperPortAllocatorSession::SendSessionRequest(
     const std::string& host,
     int port) {
   relay_url_loader_.reset(new pp::URLLoader(instance_));
   pp::URLRequestInfo request_info(instance_);
   std::string url = "https://" + host + ":" + base::IntToString(port) +
       GetSessionRequestUrl() + "&sn=1";
@@ skipping 136 matching lines @@
     const std::string& content_name,
     int component,
     const std::string& ice_username_fragment,
     const std::string& ice_password) {
    return new PepperPortAllocatorSession(
        this, content_name, component, ice_username_fragment, ice_password,
        stun_hosts(), relay_hosts(), relay_token(), instance_);
 }
 
 }  // namespace remoting