Rolling libjingle to 158:159

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"
@@ skipping 58 matching lines @@
         web_frame, socket_dispatcher_, network_manager_.get(),
         socket_factory_.get(), config));
   } 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(
+  channel_.reset(new cricket::P2PTransportChannel("",

[Sergey Ulanov, 2012/07/13 21:06:24]

move the new parameter to the next line.

[Ronghua Wu (Left Chromium), 2012/07/14 00:06:41]

Done.

       0, NULL, allocator_.get()));
   channel_->SetIceUfrag(
       talk_base::CreateRandomString(cricket::ICE_UFRAG_LENGTH));
   channel_->SetIcePwd(talk_base::CreateRandomString(cricket::ICE_PWD_LENGTH));
   channel_->SignalRequestSignaling.connect(
       this, &P2PTransportImpl::OnRequestSignaling);
   channel_->SignalCandidateReady.connect(
       this, &P2PTransportImpl::OnCandidateReady);
 
   if (protocol == PROTOCOL_UDP) {
@@ skipping 75 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