Support GCM ciphers even if ENABLE_EXTERNAL_AUTH is defined.

webrtc/pc/channelmanager.cc

 /*
  *  Copyright 2004 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 83 matching lines @@
       &ChannelManager::SetCryptoOptions_w, this, crypto_options));
 }
 
 bool ChannelManager::SetCryptoOptions_w(
     const rtc::CryptoOptions& crypto_options) {
   if (!video_channels_.empty() || !voice_channels_.empty() ||
       !data_channels_.empty()) {
     LOG(LS_WARNING) << "Not changing crypto options in existing channels.";
   }
   crypto_options_ = crypto_options;
-#if defined(ENABLE_EXTERNAL_AUTH)
-  if (crypto_options_.enable_gcm_crypto_suites) {
-    // TODO(jbauch): Re-enable once https://crbug.com/628400 is resolved.
-    crypto_options_.enable_gcm_crypto_suites = false;
-    LOG(LS_WARNING) << "GCM ciphers are not supported with " <<
-        "ENABLE_EXTERNAL_AUTH and will be disabled.";
-  }
-#endif
   return true;
 }
 
 void ChannelManager::GetSupportedAudioSendCodecs(
     std::vector<AudioCodec>* codecs) const {
   *codecs = media_engine_->audio_send_codecs();
 }
 
 void ChannelManager::GetSupportedAudioReceiveCodecs(
     std::vector<AudioCodec>* codecs) const {
@@ skipping 329 matching lines @@
                           media_engine_.get(), file, max_size_bytes));
 }
 
 void ChannelManager::StopAecDump() {
   worker_thread_->Invoke<void>(
       RTC_FROM_HERE,
       Bind(&MediaEngineInterface::StopAecDump, media_engine_.get()));
 }
 
 }  // namespace cricket