Roll libjingle 132:133

remoting/protocol/jingle_messages.h

Index: remoting/protocol/jingle_messages.h
diff --git a/remoting/protocol/jingle_messages.h b/remoting/protocol/jingle_messages.h
index f404912e3b5b940863b974792b16db59c3184c33..43dca4ad8a6d105b64dbad57466000e93a6c03bc 100644
--- a/remoting/protocol/jingle_messages.h
+++ b/remoting/protocol/jingle_messages.h
@@ -9,11 +9,9 @@
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
+#include "third_party/libjingle/source/talk/p2p/base/candidate.h"
 #include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
 
-namespace cricket {
-class Candidate;
-}  // namespace cricket
 
 namespace remoting {
 namespace protocol {
@@ -43,6 +41,15 @@ struct JingleMessage {
     INCOMPATIBLE_PARAMETERS,
   };
 
+  struct NamedCandidate {
+    NamedCandidate();
+    NamedCandidate(const std::string& name,
+                   const cricket::Candidate& candidate);
+
+    std::string name;
+    cricket::Candidate candidate;
+  };
+
   JingleMessage();
   JingleMessage(const std::string& to_value,
                 ActionType action_value,
@@ -65,7 +72,7 @@ struct JingleMessage {
   std::string sid;
 
   scoped_ptr<ContentDescription> description;
-  std::list<cricket::Candidate> candidates;
+  std::list<NamedCandidate> candidates;

[Ronghua Wu (Left Chromium), 2012/04/24 21:49:44]

Without knowing remoting code well enough, do you really need the candidate
name, which doesn't really mean much for a candidate.

[Sergey Ulanov, 2012/04/24 23:58:22]

The name is used to distinguish between channels the candidate belongs to.

[Ronghua Wu (Left Chromium), 2012/04/25 00:29:09]

ok.

 
   // Content of session-info messages.
   scoped_ptr<buzz::XmlElement> info;