Multi-step authentication support in JingleSession.

remoting/protocol/content_description.cc

Index: remoting/protocol/content_description.cc
diff --git a/remoting/protocol/content_description.cc b/remoting/protocol/content_description.cc
index d6947d7031f5ca2dfb18108eaebcd3caffdd79d8..c672aa34f71439fd4bae46a63aeb9ede27749c6f 100644
--- a/remoting/protocol/content_description.cc
+++ b/remoting/protocol/content_description.cc
@@ -6,6 +6,7 @@
 
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
+#include "remoting/protocol/authenticator.h"

[Wez, 2011/12/03 00:21:05]

This goes below remoting/base/constants.h

[Sergey Ulanov, 2011/12/06 19:37:07]

Done.

 #include "remoting/base/constants.h"
 #include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
 
@@ -27,7 +28,6 @@ const char kControlTag[] = "control";
 const char kEventTag[] = "event";
 const char kVideoTag[] = "video";
 const char kResolutionTag[] = "initial-resolution";
-const char kAuthenticationTag[] = "authentication";
 
 const char kTransportAttr[] = "transport";
 const char kVersionAttr[] = "version";
@@ -198,8 +198,7 @@ XmlElement* ContentDescription::ToXml() const {
   root->AddElement(resolution_tag);
 
   if (authenticator_message_.get()) {
-    DCHECK(authenticator_message_->Name() ==
-           QName(kChromotingXmlNamespace, kAuthenticationTag));
+    DCHECK(Authenticator::IsAuthenticatorMessage(authenticator_message_.get()));
     root->AddElement(new XmlElement(*authenticator_message_));
   }
 
@@ -266,8 +265,7 @@ ContentDescription* ContentDescription::ParseXml(
     *config->mutable_initial_resolution() = resolution;
 
     scoped_ptr<XmlElement> authenticator_message;
-    child = element->FirstNamed(QName(kChromotingXmlNamespace,
-                                      kAuthenticationTag));
+    child = Authenticator::FindAuthenticatorMessage(element);
     if (child)
       authenticator_message.reset(new XmlElement(*child));