Changes needed to roll libjingle r141

remoting/client/plugin/pepper_port_allocator.cc

Index: remoting/client/plugin/pepper_port_allocator.cc
===================================================================
--- remoting/client/plugin/pepper_port_allocator.cc	(revision 137544)
+++ remoting/client/plugin/pepper_port_allocator.cc	(working copy)
@@ -32,8 +32,9 @@
  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,
@@ -73,15 +74,16 @@
 
 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),
@@ -204,7 +206,6 @@
   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";

[Sergey Ulanov, 2012/05/17 17:35:32]

In talk/p2p/client/httpportallocator.cc this field is still added with a fake
value. Are you sure it is not needed anymore? If not, it might be safer to keep
it with a fake value, e.g. "chromoting"

[Mallinath (Gone from Chromium), 2012/05/17 18:03:05]

I think its not needed, but i am not sure. To be safe as you  suggested added
"chromoting".

On 2012/05/17 17:35:32, sergeyu wrote:

[Sergey Ulanov, 2012/05/17 18:24:27]

Ok, please add it in host_port_allocator.cc too.

[Mallinath (Gone from Chromium), 2012/05/17 18:39:10]

Done.

   request_info.SetHeaders(headers.str());
 
   int result = relay_url_loader_->Open(request_info, pp::CompletionCallback(
@@ -328,12 +329,13 @@
 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