Rolling libjingle to 158:159

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 64 matching lines @@
 PepperPortAllocatorSession::PepperPortAllocatorSession(
     cricket::HttpPortAllocatorBase* allocator,
     int component,
     const std::string& ice_username_fragment,
     const std::string& ice_password,
     const std::vector<talk_base::SocketAddress>& stun_hosts,
     const std::vector<std::string>& relay_hosts,
     const std::string& relay_token,
     const pp::InstanceHandle& instance)
     : HttpPortAllocatorSessionBase(
-        allocator, component, ice_username_fragment, ice_password,
+        allocator, "", component, ice_username_fragment, ice_password,
         stun_hosts, relay_hosts, relay_token, ""),
       instance_(instance),
       stun_address_resolver_(instance_),
       stun_port_(0),
       relay_response_received_(false) {
   if (stun_hosts.size() > 0) {
     stun_address_ = stun_hosts[0];
   }
 }
 
@@ skipping 233 matching lines @@
   // username fragment is shared between all candidates for this
   // channel.
   set_flags(cricket::PORTALLOCATOR_DISABLE_TCP |
             cricket::PORTALLOCATOR_ENABLE_SHARED_UFRAG);
 }
 
 PepperPortAllocator::~PepperPortAllocator() {
 }
 
 cricket::PortAllocatorSession* PepperPortAllocator::CreateSessionInternal(
+    const std::string& content_name,
     int component,
     const std::string& ice_username_fragment,
     const std::string& ice_password) {
    return new PepperPortAllocatorSession(
        this, component, ice_username_fragment, ice_password,

[Sergey Ulanov, 2012/07/13 01:22:48]

do we need to pass content_name to PepperPortAllocatorSession() so that it can
pass it to HttpPortAllocatorSessionBase?

[Ronghua Wu (Left Chromium), 2012/07/13 18:26:35]

Done.

        stun_hosts(), relay_hosts(), relay_token(), instance_);
 }
 
 }  // namespace remoting