Changes needed to roll libjingle r141

content/renderer/p2p/p2p_transport_impl.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/p2p_transport_impl.h"
 
 #include "content/renderer/p2p/ipc_network_manager.h"
 #include "content/renderer/p2p/ipc_socket_factory.h"
 #include "content/renderer/p2p/port_allocator.h"
 #include "jingle/glue/channel_socket_adapter.h"
 #include "jingle/glue/pseudotcp_adapter.h"
 #include "jingle/glue/thread_wrapper.h"
 #include "jingle/glue/utils.h"
 #include "net/base/net_errors.h"
+#include "third_party/libjingle/source/talk/base/helpers.h"
+#include "third_party/libjingle/source/talk/p2p/base/constants.h"
 #include "third_party/libjingle/source/talk/p2p/base/p2ptransportchannel.h"
 #include "third_party/libjingle/source/talk/p2p/client/basicportallocator.h"
 
 namespace content {
 
 P2PTransportImpl::P2PTransportImpl(
     talk_base::NetworkManager* network_manager,
     talk_base::PacketSocketFactory* socket_factory)
     : socket_dispatcher_(NULL),
       event_handler_(NULL),
       state_(STATE_NONE),
+      ice_username_fragment_(
+          talk_base::CreateRandomString(cricket::ICE_UFRAG_LENGTH)),

[Sergey Ulanov, 2012/05/10 21:36:25]

Given that these values are used only once in the Init() method you could just
generate them there, there is no need to store them.

[Mallinath (Gone from Chromium), 2012/05/10 21:41:21]

Done.

+      ice_password_(talk_base::CreateRandomString(cricket::ICE_PWD_LENGTH)),
       network_manager_(network_manager),
       socket_factory_(socket_factory) {
 }
 
 P2PTransportImpl::P2PTransportImpl(P2PSocketDispatcher* socket_dispatcher)
     : socket_dispatcher_(socket_dispatcher),
       event_handler_(NULL),
       state_(STATE_NONE),
       network_manager_(new IpcNetworkManager(socket_dispatcher)),
       socket_factory_(new IpcPacketSocketFactory(socket_dispatcher)) {
@@ skipping 33 matching lines @@
   } else {
     // Use BasicPortAllocator if we don't have P2PSocketDispatcher
     // (for unittests).
     allocator_.reset(new cricket::BasicPortAllocator(
         network_manager_.get(), socket_factory_.get()));
   }
 
   DCHECK(!channel_.get());
   channel_.reset(new cricket::P2PTransportChannel(
       name, 0, NULL, allocator_.get()));
+  channel_->SetIceUfrag(ice_username_fragment_);
+  channel_->SetIcePwd(ice_password_);
   channel_->SignalRequestSignaling.connect(
       this, &P2PTransportImpl::OnRequestSignaling);
   channel_->SignalCandidateReady.connect(
       this, &P2PTransportImpl::OnCandidateReady);
 
   if (protocol == PROTOCOL_UDP) {
     channel_->SignalReadableState.connect(
         this, &P2PTransportImpl::OnReadableState);
     channel_->SignalWritableState.connect(
         this, &P2PTransportImpl::OnWriteableState);
@@ skipping 71 matching lines @@
 void P2PTransportImpl::OnTcpConnected(int result) {
   if (result < 0) {
     event_handler_->OnError(result);
     return;
   }
   state_ = static_cast<State>(STATE_READABLE | STATE_WRITABLE);
   event_handler_->OnStateChange(state_);
 }
 
 }  // namespace content