Changes needed to roll libjingle r141

content/renderer/p2p/p2p_transport_impl.h

 // 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.
 
 #ifndef CONTENT_RENDERER_P2P_P2P_TRANSPORT_IMPL_H_
 #define CONTENT_RENDERER_P2P_P2P_TRANSPORT_IMPL_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 60 matching lines @@
                         const cricket::Candidate& candidate);
   void OnReadableState(cricket::TransportChannel* channel);
   void OnWriteableState(cricket::TransportChannel* channel);
 
   void OnTcpConnected(int result);
 
   P2PSocketDispatcher* socket_dispatcher_;
   std::string name_;
   EventHandler* event_handler_;
   State state_;
+  std::string ice_username_fragment_;
+  std::string ice_password_;
 
   scoped_ptr<talk_base::NetworkManager> network_manager_;
   scoped_ptr<talk_base::PacketSocketFactory> socket_factory_;
 
   scoped_ptr<cricket::PortAllocator> allocator_;
   scoped_ptr<cricket::P2PTransportChannel> channel_;
 
   scoped_ptr<jingle_glue::TransportChannelSocketAdapter> channel_adapter_;
   scoped_ptr<jingle_glue::PseudoTcpAdapter> pseudo_tcp_adapter_;
 
   DISALLOW_COPY_AND_ASSIGN(P2PTransportImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_P2P_P2P_TRANSPORT_IMPL_H_