Roll libjingle 132:133

remoting/protocol/jingle_session.cc

Index: remoting/protocol/jingle_session.cc
diff --git a/remoting/protocol/jingle_session.cc b/remoting/protocol/jingle_session.cc
index 548f0c65239cfa465e121d09c6b6efc17bda55f3..bd3d720e6aa6ad77fdc21c8324a772182b03f190 100644
--- a/remoting/protocol/jingle_session.cc
+++ b/remoting/protocol/jingle_session.cc
@@ -246,7 +246,8 @@ void JingleSession::Close() {
 
 void JingleSession::OnTransportCandidate(Transport* transport,
                                          const cricket::Candidate& candidate) {
-  pending_candidates_.push_back(candidate);
+  pending_candidates_.push_back(JingleMessage::NamedCandidate(
+      transport->name(), candidate));
 
   if (!transport_infos_timer_.IsRunning()) {
     // Delay sending the new candidates in case we get more candidates
@@ -438,15 +439,15 @@ void JingleSession::OnSessionInfo(const JingleMessage& message,
 }
 
 void JingleSession::ProcessTransportInfo(const JingleMessage& message) {
-  for (std::list<cricket::Candidate>::const_iterator it =
+  for (std::list<JingleMessage::NamedCandidate>::const_iterator it =
            message.candidates.begin();
        it != message.candidates.end(); ++it) {
-    ChannelsMap::iterator channel = channels_.find(it->name());
+    ChannelsMap::iterator channel = channels_.find(it->name);
     if (channel == channels_.end()) {
-      LOG(WARNING) << "Received candidate for unknown channel " << it->name();
+      LOG(WARNING) << "Received candidate for unknown channel " << it->name;
       continue;
     }
-    channel->second->AddRemoteCandidate(*it);
+    channel->second->AddRemoteCandidate(it->candidate);
   }
 }