Roll libjingle 132:133

remoting/protocol/libjingle_transport_factory.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/protocol/libjingle_transport_factory.h"
 
 #include "base/message_loop_proxy.h"
 #include "jingle/glue/channel_socket_adapter.h"
 #include "jingle/glue/pseudotcp_adapter.h"
 #include "jingle/glue/utils.h"
@@ skipping 137 matching lines @@
   } else {
     port_allocator_flags |= cricket::PORTALLOCATOR_DISABLE_STUN |
         cricket::PORTALLOCATOR_DISABLE_RELAY;
     port_allocator_.reset(
         new cricket::BasicPortAllocator(network_manager_, socket_factory_));
   }
   port_allocator_->set_flags(port_allocator_flags);
 
   port_allocator_->SetPortRange(config_.min_port, config_.max_port);
 
+  DCHECK(!channel_.get());
+
   // Create P2PTransportChannel, attach signal handlers and connect it.
-  DCHECK(!channel_.get());
+  // TODO(sergeyu): Specify correct component ID for the channel.
   channel_.reset(new cricket::P2PTransportChannel(
-      name_, "", NULL, port_allocator_.get()));
+      name_, 0, NULL, port_allocator_.get()));
   channel_->SignalRequestSignaling.connect(
       this, &LibjingleStreamTransport::OnRequestSignaling);
   channel_->SignalCandidateReady.connect(
       this, &LibjingleStreamTransport::OnCandidateReady);
   channel_->SignalRouteChange.connect(
       this, &LibjingleStreamTransport::OnRouteChange);
   if (config_.nat_traversal_mode == TransportConfig::NAT_TRAVERSAL_DISABLED)
     channel_->set_incoming_only(true);
 
   channel_->Connect();
@@ skipping 68 matching lines @@
     route.type = TransportRoute::RELAY;
   } else {
     LOG(FATAL) << "Unknown candidate type: " << candidate.type();
   }
 
   if (!jingle_glue::SocketAddressToIPEndPoint(
           candidate.address(), &route.remote_address)) {
     LOG(FATAL) << "Failed to convert peer IP address.";
   }
 
-  DCHECK(channel->GetP2PChannel());
-  DCHECK(channel->GetP2PChannel()->best_connection());
+  DCHECK(channel_->best_connection());
   const cricket::Candidate& local_candidate =
-      channel->GetP2PChannel()->best_connection()->local_candidate();
+      channel_->best_connection()->local_candidate();
   if (!jingle_glue::SocketAddressToIPEndPoint(
           local_candidate.address(), &route.local_address)) {
     LOG(FATAL) << "Failed to convert local IP address.";
   }
 
   event_handler_->OnTransportRouteChange(this, route);
 }
 
 void LibjingleStreamTransport::OnTcpConnected(int result) {
   DCHECK(CalledOnValidThread());
@@ skipping 80 matching lines @@
 }
 
 scoped_ptr<DatagramTransport>
 LibjingleTransportFactory::CreateDatagramTransport() {
   NOTIMPLEMENTED();
   return scoped_ptr<DatagramTransport>(NULL);
 }
 
 }  // namespace protocol
 }  // namespace remoting