Remove VPX conditionals from media and remoting.

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>
 
 namespace remoting {
 namespace protocol {
@@ skipping 163 matching lines @@
                     kControlStreamVersion,
                     ChannelConfig::CODEC_UNDEFINED));
 
   // Event channel.
   result->mutable_event_configs()->push_back(
       ChannelConfig(ChannelConfig::TRANSPORT_MUX_STREAM,
                     kDefaultStreamVersion,
                     ChannelConfig::CODEC_UNDEFINED));
 
   // Video channel.
-#if !defined(MEDIA_DISABLE_LIBVPX)
   result->mutable_video_configs()->push_back(
       ChannelConfig(ChannelConfig::TRANSPORT_STREAM,
                     kDefaultStreamVersion,
                     ChannelConfig::CODEC_VP8));
-#endif  // !defined(MEDIA_DISABLE_LIBVPX)
 
   // Audio channel.
   result->mutable_audio_configs()->push_back(
       ChannelConfig(ChannelConfig::TRANSPORT_MUX_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::EnableVideoCodec(ChannelConfig::Codec codec) {
   mutable_video_configs()->push_front(
       ChannelConfig(ChannelConfig::TRANSPORT_STREAM,
                     kDefaultStreamVersion,
                     codec));
 }
 
 }  // namespace protocol
 }  // namespace remoting