Use standard ICE in Chromoting.

Previously we were using legacy, non-standard version of ICE. This
change adds ICE version negotiation and enabled standard ICE by default,
when both peers support it.

BUG=473758

Committed: https://crrev.com/5a5854ee3e1c5760b422f26d31909bfb5dca631f
Cr-Commit-Position: refs/heads/master@{#326560}

Review URL: https://codereview.chromium.org/1085703003

Cr-Commit-Position: refs/heads/master@{#326600}

1 files changed, 19 insertions, 23 deletions

diff --git a/remoting/protocol/content_description.cc b/remoting/protocol/content_description.cc
index 5d8aaac..a48c57b 100644
--- a/remoting/protocol/content_description.cc
+++ b/remoting/protocol/content_description.cc
@@ -25,6 +25,7 @@ const char kDefaultNs[] = "";
 
 // Following constants are used to format session description in XML.
 const char kDescriptionTag[] = "description";
+const char kStandardIceTag[] = "standard-ice";
 const char kControlTag[] = "control";
 const char kEventTag[] = "event";
 const char kVideoTag[] = "video";
@@ -121,17 +122,10 @@ ContentDescription::ContentDescription(
 
 ContentDescription::~ContentDescription() { }
 
-ContentDescription* ContentDescription::Copy() const {
-  if (!candidate_config_.get() || !authenticator_message_.get()) {
-    return nullptr;
-  }
-  scoped_ptr<XmlElement> message(new XmlElement(*authenticator_message_));
-  return new ContentDescription(candidate_config_->Clone(), message.Pass());
-}
-
 // ToXml() creates content description for chromoting session. The
 // description looks as follows:
 //   <description xmlns="google:remoting">
+//     <standard-ice/>
 //     <control transport="stream" version="1" />
 //     <event transport="datagram" version="1" />
 //     <video transport="stream" codec="vp8" version="1" />
@@ -145,27 +139,25 @@ XmlElement* ContentDescription::ToXml() const {
   XmlElement* root = new XmlElement(
       QName(kChromotingXmlNamespace, kDescriptionTag), true);
 
-  std::list<ChannelConfig>::const_iterator it;
+  if (config()->standard_ice()) {
+    root->AddElement(
+        new buzz::XmlElement(QName(kChromotingXmlNamespace, kStandardIceTag)));
+  }
 
-  for (it = config()->control_configs().begin();
-       it != config()->control_configs().end(); ++it) {
-    root->AddElement(FormatChannelConfig(*it, kControlTag));
+  for (const ChannelConfig& channel_config : config()->control_configs()) {
+    root->AddElement(FormatChannelConfig(channel_config, kControlTag));
   }
 
-  for (it = config()->event_configs().begin();
-       it != config()->event_configs().end(); ++it) {
-    root->AddElement(FormatChannelConfig(*it, kEventTag));
+  for (const ChannelConfig& channel_config : config()->event_configs()) {
+    root->AddElement(FormatChannelConfig(channel_config, kEventTag));
   }
 
-  for (it = config()->video_configs().begin();
-       it != config()->video_configs().end(); ++it) {
-    root->AddElement(FormatChannelConfig(*it, kVideoTag));
+  for (const ChannelConfig& channel_config : config()->video_configs()) {
+    root->AddElement(FormatChannelConfig(channel_config, kVideoTag));
   }
 
-  for (it = config()->audio_configs().begin();
-       it != config()->audio_configs().end(); ++it) {
-    ChannelConfig config = *it;
-    root->AddElement(FormatChannelConfig(config, kAudioTag));
+  for (const ChannelConfig& channel_config : config()->audio_configs()) {
+    root->AddElement(FormatChannelConfig(channel_config, kAudioTag));
   }
 
   // Older endpoints require an initial-resolution tag, but otherwise ignore it.
@@ -192,7 +184,6 @@ bool ContentDescription::ParseChannelConfigs(
     bool codec_required,
     bool optional,
     std::list<ChannelConfig>* const configs) {
-
   QName tag(kChromotingXmlNamespace, tag_name);
   const XmlElement* child = element->FirstNamed(tag);
   while (child) {
@@ -218,6 +209,11 @@ scoped_ptr<ContentDescription> ContentDescription::ParseXml(
   }
   scoped_ptr<CandidateSessionConfig> config(
       CandidateSessionConfig::CreateEmpty());
+
+  config->set_standard_ice(
+      element->FirstNamed(QName(kChromotingXmlNamespace, kStandardIceTag)) !=
+      nullptr);
+
   if (!ParseChannelConfigs(element, kControlTag, false, false,
                            config->mutable_control_configs()) ||
       !ParseChannelConfigs(element, kEventTag, false, false,