Index: remoting/protocol/content_description.cc |
diff --git a/remoting/protocol/content_description.cc b/remoting/protocol/content_description.cc |
index 9d9f30a78ceda98ed2cccf0b2d11a0cd4e22422b..f50f46bf663d285d45427d72679a70303a0512ef 100644 |
--- a/remoting/protocol/content_description.cc |
+++ b/remoting/protocol/content_description.cc |
@@ -32,7 +32,6 @@ const char kEventTag[] = "event"; |
const char kVideoTag[] = "video"; |
const char kAudioTag[] = "audio"; |
const char kVp9ExperimentTag[] = "vp9-experiment"; |
-const char kQuicConfigTag[] = "quic-config"; |
const char kTransportAttr[] = "transport"; |
const char kVersionAttr[] = "version"; |
@@ -41,7 +40,6 @@ const char kCodecAttr[] = "codec"; |
const NameMapElement<ChannelConfig::TransportType> kTransports[] = { |
{ ChannelConfig::TRANSPORT_STREAM, "stream" }, |
{ ChannelConfig::TRANSPORT_MUX_STREAM, "mux-stream" }, |
- { ChannelConfig::TRANSPORT_QUIC_STREAM, "quic-stream" }, |
{ ChannelConfig::TRANSPORT_DATAGRAM, "datagram" }, |
{ ChannelConfig::TRANSPORT_NONE, "none" }, |
}; |
@@ -116,11 +114,9 @@ bool ParseChannelConfig(const XmlElement* element, bool codec_required, |
ContentDescription::ContentDescription( |
scoped_ptr<CandidateSessionConfig> config, |
- scoped_ptr<buzz::XmlElement> authenticator_message, |
- const std::string& quic_config_message) |
+ scoped_ptr<buzz::XmlElement> authenticator_message) |
: candidate_config_(config.Pass()), |
- authenticator_message_(authenticator_message.Pass()), |
- quic_config_message_(quic_config_message) { |
+ authenticator_message_(authenticator_message.Pass()) { |
} |
ContentDescription::~ContentDescription() { } |
@@ -168,15 +164,6 @@ XmlElement* ContentDescription::ToXml() const { |
root->AddElement(new XmlElement(*authenticator_message_)); |
} |
- if (!quic_config_message_.empty()) { |
- XmlElement* quic_config_tag = |
- new XmlElement(QName(kChromotingXmlNamespace, kQuicConfigTag)); |
- root->AddElement(quic_config_tag); |
- std::string config_base64; |
- base::Base64Encode(quic_config_message_, &config_base64); |
- quic_config_tag->SetBodyText(config_base64); |
- } |
- |
if (config()->vp9_experiment_enabled()) { |
root->AddElement( |
new XmlElement(QName(kChromotingXmlNamespace, kVp9ExperimentTag))); |
@@ -248,19 +235,8 @@ scoped_ptr<ContentDescription> ContentDescription::ParseXml( |
if (child) |
authenticator_message.reset(new XmlElement(*child)); |
- std::string quic_config_message; |
- const XmlElement* quic_config_tag = |
- element->FirstNamed(QName(kChromotingXmlNamespace, kQuicConfigTag)); |
- if (quic_config_tag) { |
- if (!base::Base64Decode(quic_config_tag->BodyText(), |
- &quic_config_message)) { |
- LOG(ERROR) << "Failed to parse QUIC config."; |
- return nullptr; |
- } |
- } |
- |
- return make_scoped_ptr(new ContentDescription( |
- config.Pass(), authenticator_message.Pass(), quic_config_message)); |
+ return make_scoped_ptr( |
+ new ContentDescription(config.Pass(), authenticator_message.Pass())); |
} |
} // namespace protocol |