Changes needed to roll libjingle r141

content/renderer/p2p/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 "content/renderer/p2p/port_allocator.h"
 
 #include "base/bind.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
@@ skipping 52 matching lines @@
       config_(config) {
   uint32 flags = 0;
   if (config_.disable_tcp_transport)
     flags |= cricket::PORTALLOCATOR_DISABLE_TCP;
   set_flags(flags);
 }
 
 P2PPortAllocator::~P2PPortAllocator() {
 }
 
-cricket::PortAllocatorSession* P2PPortAllocator::CreateSession(
-    const std::string& channel_name,
-    int component) {
-  return new P2PPortAllocatorSession(this, channel_name, component);
+cricket::PortAllocatorSession* P2PPortAllocator::CreateSessionInternal(
+    int component,
+    const std::string& ice_username_fragment,
+    const std::string& ice_password) {
+  return new P2PPortAllocatorSession(
+      this, component, ice_username_fragment, ice_password);
 }
 
 P2PPortAllocatorSession::P2PPortAllocatorSession(
     P2PPortAllocator* allocator,
-    const std::string& channel_name,
-    int component)
-    : cricket::BasicPortAllocatorSession(allocator, channel_name, component),
+    int component,
+    const std::string& ice_username_fragment,
+    const std::string& ice_password)
+    : cricket::BasicPortAllocatorSession(
+        allocator, component,
+        ice_username_fragment, ice_password),
       allocator_(allocator),
       relay_session_attempts_(0),
       relay_udp_port_(0),
       relay_tcp_port_(0),
       relay_ssltcp_port_(0) {
 }
 
 P2PPortAllocatorSession::~P2PPortAllocatorSession() {
   if (stun_address_request_)
     stun_address_request_->Cancel();
@@ skipping 120 matching lines @@
   request.setAllowStoredCredentials(false);
   request.setCachePolicy(WebURLRequest::ReloadIgnoringCacheData);
   request.setHTTPMethod("GET");
   request.addHTTPHeaderField(
       WebString::fromUTF8("X-Talk-Google-Relay-Auth"),
       WebString::fromUTF8(allocator_->config_.relay_password));
   request.addHTTPHeaderField(
       WebString::fromUTF8("X-Google-Relay-Auth"),
       WebString::fromUTF8(allocator_->config_.relay_password));
   request.addHTTPHeaderField(WebString::fromUTF8("X-Stream-Type"),
-                             WebString::fromUTF8(channel_name()));
+                             WebString::fromUTF8("chromoting"));
 
   relay_session_request_->loadAsynchronously(request, this);
 }
 
 void P2PPortAllocatorSession::ParseRelayResponse() {
   std::vector<std::pair<std::string, std::string> > value_pairs;
   if (!base::SplitStringIntoKeyValuePairs(relay_session_response_, '=', '\n',
                                           &value_pairs)) {
     LOG(ERROR) << "Received invalid response from relay server";
     return;
@@ skipping 63 matching lines @@
       talk_base::SocketAddress address(relay_ip_.ip(), relay_ssltcp_port_);
       ports.push_back(cricket::ProtocolAddress(address, cricket::PROTO_SSLTCP));
     }
     if (!ports.empty())
       config->AddRelay(ports, 0.0f);
   }
   ConfigReady(config);
 }
 
 }  // namespace content