Changes needed to roll libjingle r141

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 14 matching lines @@
 
 // Read buffer we allocate per read when reading response from
 // URLLoader. Normally the response from URL loader is smaller than 1kB.
 const int kReadSize = 1024;
 
 class PepperPortAllocatorSession
     : public cricket::HttpPortAllocatorSessionBase {
  public:
   PepperPortAllocatorSession(
       cricket::HttpPortAllocatorBase* allocator,
-      const std::string& channel_name,
       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);
   virtual ~PepperPortAllocatorSession();
 
   // cricket::HttpPortAllocatorBase overrides.
   virtual void ConfigReady(cricket::PortConfiguration* config) OVERRIDE;
   virtual void GetPortConfigurations() OVERRIDE;
   virtual void SendSessionRequest(const std::string& host, int port) OVERRIDE;
@@ skipping 19 matching lines @@
 
   scoped_ptr<pp::URLLoader> relay_url_loader_;
   std::vector<char> relay_response_body_;
   bool relay_response_received_;
 
   DISALLOW_COPY_AND_ASSIGN(PepperPortAllocatorSession);
 };
 
 PepperPortAllocatorSession::PepperPortAllocatorSession(
     cricket::HttpPortAllocatorBase* allocator,
-    const std::string& channel_name,
     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)
-    : cricket::HttpPortAllocatorSessionBase(
-        allocator, channel_name, component, stun_hosts,
-        relay_hosts, relay_token, ""),
+    : HttpPortAllocatorSessionBase(
+        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) {
   set_flags(cricket::PORTALLOCATOR_DISABLE_TCP);
   if (stun_hosts.size() > 0) {
     stun_address_ = stun_hosts[0];
   }
 }
 
@@ skipping 102 matching lines @@
     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";
   request_info.SetURL(url);
   request_info.SetMethod("GET");
   std::stringstream headers;
   headers << "X-Talk-Google-Relay-Auth: " << relay_token() << "\n\r";
   headers << "X-Google-Relay-Auth: " << relay_token() << "\n\r";
-  headers << "X-StreamType: " << channel_name() << "\n\r";
+  headers << "X-Stream-Type: " << "chromoting" << "\n\r";
   request_info.SetHeaders(headers.str());
 
   int result = relay_url_loader_->Open(request_info, pp::CompletionCallback(
       &PepperPortAllocatorSession::UrlLoaderOpenCallback, this));
   DCHECK_EQ(result, PP_OK_COMPLETIONPENDING);
 }
 
 void PepperPortAllocatorSession::OnUrlOpened(int32_t result) {
   if (result == PP_ERROR_ABORTED) {
     return;
@@ skipping 103 matching lines @@
     scoped_ptr<talk_base::PacketSocketFactory> socket_factory)
     : HttpPortAllocatorBase(network_manager.get(), socket_factory.get(), ""),
       instance_(instance),
       network_manager_(network_manager.Pass()),
       socket_factory_(socket_factory.Pass()) {
 }
 
 PepperPortAllocator::~PepperPortAllocator() {
 }
 
-cricket::PortAllocatorSession* PepperPortAllocator::CreateSession(
-    const std::string& channel_name,
-    int component) {
-  return new PepperPortAllocatorSession(
-      this, channel_name, component, stun_hosts(),
-      relay_hosts(), relay_token(), instance_);
+cricket::PortAllocatorSession* PepperPortAllocator::CreateSessionInternal(
+    int component,
+    const std::string& ice_username_fragment,
+    const std::string& ice_password) {
+   return new PepperPortAllocatorSession(
+       this, component, ice_username_fragment, ice_password,
+       stun_hosts(), relay_hosts(), relay_token(), instance_);
 }
 
 }  // namespace remoting