Roll libjingle 132:133

remoting/protocol/jingle_session.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/jingle_session.h"
 
 #include "base/bind.h"
 #include "base/rand_util.h"
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
@@ skipping 228 matching lines @@
 }
 
 void JingleSession::Close() {
   DCHECK(CalledOnValidThread());
 
   CloseInternal(OK);
 }
 
 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
     // that we can send in one message.
     transport_infos_timer_.Start(
         FROM_HERE, base::TimeDelta::FromMilliseconds(kTransportInfoSendDelayMs),
         this, &JingleSession::SendTransportInfo);
   }
 }
 
@@ skipping 171 matching lines @@
     return;
   }
 
   reply_callback.Run(JingleMessageReply::NONE);
 
   authenticator_->ProcessMessage(message.info.get());
   ProcessAuthenticationStep();
 }
 
 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);
   }
 }
 
 void JingleSession::OnTerminate(const JingleMessage& message,
                                 const ReplyCallback& reply_callback) {
   if (state_ != CONNECTING && state_ != CONNECTED && state_ != AUTHENTICATED) {
     LOG(WARNING) << "Received unexpected session-terminate message.";
     reply_callback.Run(JingleMessageReply::UNEXPECTED_REQUEST);
     return;
   }
@@ skipping 121 matching lines @@
     DCHECK_NE(state_, FAILED);
 
     state_ = new_state;
     if (!state_change_callback_.is_null())
       state_change_callback_.Run(new_state);
   }
 }
 
 }  // namespace protocol
 }  // namespace remoting