Deleted unused enums MediaChannelOptions and VoiceMediaChannelOptions,

talk/media/webrtc/webrtcvideoengine2_unittest.cc

 /*
  * libjingle
  * Copyright 2004 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 3123 matching lines @@
   // TODO(pbos): Implement.
   FAIL() << "Not implemented.";
 }
 
 // Test 1:1 call never turn on simulcast.
 TEST_F(WebRtcVideoEngine2SimulcastTest, DISABLED_NoSimulcastWith1on1) {
   // TODO(pbos): Implement.
   FAIL() << "Not implemented.";
 }
 
-// Test SetOptions with OPT_CONFERENCE flag.
+// Test SetOptions with conference mode.
 TEST_F(WebRtcVideoEngine2SimulcastTest, DISABLED_SetOptionsWithConferenceMode) {
   // TODO(pbos): Implement.
   FAIL() << "Not implemented.";
 }
 
 // Test that two different streams can have different formats.
 TEST_F(WebRtcVideoEngine2SimulcastTest,
        DISABLED_MultipleSendStreamsDifferentFormats) {
   // TODO(pbos): Implement.
   FAIL() << "Not implemented.";
@@ skipping 245 matching lines @@
 // Ensures that the correct settings are applied to the codec when two temporal
 // layer screencasting is enabled, and that the correct simulcast settings are
 // reapplied when disabling screencasting.
 TEST_F(WebRtcVideoChannel2SimulcastTest,
        DISABLED_TwoTemporalLayerScreencastSettings) {
   // TODO(pbos): Implement.
   FAIL() << "Not implemented.";
 }
 
 }  // namespace cricket