Remove QUIC support from remoting host and client.

remoting/protocol/session_config.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/session_config.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/logging.h"
@@ skipping 131 matching lines @@
   result->event_config_ = candidate_config->event_configs().front();
   result->video_config_ = candidate_config->video_configs().front();
   result->audio_config_ = candidate_config->audio_configs().front();
 
   return result;
 }
 
 // static
 scoped_ptr<SessionConfig> SessionConfig::ForTest() {
   scoped_ptr<SessionConfig> result(new SessionConfig(Protocol::ICE));
-  result->control_config_ = ChannelConfig(ChannelConfig::TRANSPORT_QUIC_STREAM,
+  result->control_config_ = ChannelConfig(ChannelConfig::TRANSPORT_MUX_STREAM,
                                           kControlStreamVersion,
                                           ChannelConfig::CODEC_UNDEFINED);
-  result->event_config_ = ChannelConfig(ChannelConfig::TRANSPORT_QUIC_STREAM,
+  result->event_config_ = ChannelConfig(ChannelConfig::TRANSPORT_MUX_STREAM,
                                         kDefaultStreamVersion,
                                         ChannelConfig::CODEC_UNDEFINED);
-  result->video_config_ = ChannelConfig(ChannelConfig::TRANSPORT_QUIC_STREAM,
+  result->video_config_ = ChannelConfig(ChannelConfig::TRANSPORT_STREAM,
                                         kDefaultStreamVersion,
                                         ChannelConfig::CODEC_VP8);
   result->audio_config_ = ChannelConfig(ChannelConfig::TRANSPORT_NONE,
                                         kDefaultStreamVersion,
                                         ChannelConfig::CODEC_UNDEFINED);
   return result.Pass();
 }
 
 scoped_ptr<SessionConfig> SessionConfig::ForTestWithVerbatimVideo() {
   scoped_ptr<SessionConfig> result = ForTest();
-  result->video_config_ = ChannelConfig(ChannelConfig::TRANSPORT_QUIC_STREAM,
+  result->video_config_ = ChannelConfig(ChannelConfig::TRANSPORT_STREAM,
                                         kDefaultStreamVersion,
                                         ChannelConfig::CODEC_VERBATIM);
   return result.Pass();
 }
 
 scoped_ptr<SessionConfig> SessionConfig::ForTestWithWebrtc() {
   return make_scoped_ptr(new SessionConfig(Protocol::WEBRTC));
 }
 
 const ChannelConfig& SessionConfig::control_config() const {
   DCHECK(protocol_ == Protocol::ICE);
   return control_config_;
 }
 const ChannelConfig& SessionConfig::event_config() const {
   DCHECK(protocol_ == Protocol::ICE);
   return event_config_;
 }
 const ChannelConfig& SessionConfig::video_config() const {
   DCHECK(protocol_ == Protocol::ICE);
   return video_config_;
 }
 const ChannelConfig& SessionConfig::audio_config() const {
   DCHECK(protocol_ == Protocol::ICE);
   return audio_config_;
 }
 
-bool SessionConfig::is_using_quic() const {
-  DCHECK(protocol_ == Protocol::ICE);
-  return control_config_.transport == ChannelConfig::TRANSPORT_QUIC_STREAM ||
-         event_config_.transport == ChannelConfig::TRANSPORT_QUIC_STREAM ||
-         video_config_.transport == ChannelConfig::TRANSPORT_QUIC_STREAM ||
-         audio_config_.transport == ChannelConfig::TRANSPORT_QUIC_STREAM;
-}
-
 SessionConfig::SessionConfig(Protocol protocol) : protocol_(protocol) {}
 
 CandidateSessionConfig::CandidateSessionConfig() {}
 CandidateSessionConfig::CandidateSessionConfig(
     const CandidateSessionConfig& config) = default;
 CandidateSessionConfig::~CandidateSessionConfig() {}
 
 bool CandidateSessionConfig::IsSupported(const SessionConfig& config) const {
   switch (config.protocol()) {
     case SessionConfig::Protocol::ICE:
@@ skipping 49 matching lines @@
 scoped_ptr<CandidateSessionConfig> CandidateSessionConfig::CreateDefault() {
   scoped_ptr<CandidateSessionConfig> result = CreateEmpty();
 
   result->set_ice_supported(true);
 
   // Control channel.
   result->mutable_control_configs()->push_back(
       ChannelConfig(ChannelConfig::TRANSPORT_MUX_STREAM,
                     kControlStreamVersion,
                     ChannelConfig::CODEC_UNDEFINED));
-  result->mutable_control_configs()->push_back(
-      ChannelConfig(ChannelConfig::TRANSPORT_QUIC_STREAM,
-                    kControlStreamVersion,
-                    ChannelConfig::CODEC_UNDEFINED));
 
   // Event channel.
   result->mutable_event_configs()->push_back(
       ChannelConfig(ChannelConfig::TRANSPORT_MUX_STREAM,
                     kDefaultStreamVersion,
                     ChannelConfig::CODEC_UNDEFINED));
-  result->mutable_event_configs()->push_back(
-      ChannelConfig(ChannelConfig::TRANSPORT_QUIC_STREAM,
-                    kDefaultStreamVersion,
-                    ChannelConfig::CODEC_UNDEFINED));
 
   // Video channel.
   result->mutable_video_configs()->push_back(
       ChannelConfig(ChannelConfig::TRANSPORT_STREAM,
                     kDefaultStreamVersion,
                     ChannelConfig::CODEC_VP9));
   result->mutable_video_configs()->push_back(
       ChannelConfig(ChannelConfig::TRANSPORT_STREAM,
                     kDefaultStreamVersion,
                     ChannelConfig::CODEC_VP8));
-  result->mutable_video_configs()->push_back(
-      ChannelConfig(ChannelConfig::TRANSPORT_QUIC_STREAM,
-                    kDefaultStreamVersion,
-                    ChannelConfig::CODEC_VP9));
-  result->mutable_video_configs()->push_back(
-      ChannelConfig(ChannelConfig::TRANSPORT_QUIC_STREAM,
-                    kDefaultStreamVersion,
-                    ChannelConfig::CODEC_VP8));
 
   // Audio channel.
   result->mutable_audio_configs()->push_back(
       ChannelConfig(ChannelConfig::TRANSPORT_MUX_STREAM,
                     kDefaultStreamVersion,
                     ChannelConfig::CODEC_OPUS));
-  result->mutable_audio_configs()->push_back(
-      ChannelConfig(ChannelConfig::TRANSPORT_QUIC_STREAM,
-                    kDefaultStreamVersion,
-                    ChannelConfig::CODEC_OPUS));
   result->mutable_audio_configs()->push_back(ChannelConfig::None());
 
   return result.Pass();
 }
 
 void CandidateSessionConfig::DisableAudioChannel() {
   mutable_audio_configs()->clear();
   mutable_audio_configs()->push_back(ChannelConfig());
 }
 
 void CandidateSessionConfig::PreferTransport(
     ChannelConfig::TransportType transport) {
   UpdateConfigListToPreferTransport(&control_configs_, transport);
   UpdateConfigListToPreferTransport(&event_configs_, transport);
   UpdateConfigListToPreferTransport(&video_configs_, transport);
   UpdateConfigListToPreferTransport(&audio_configs_, transport);
 }
 
 }  // namespace protocol
 }  // namespace remoting