Revert of H.264 packetization mode 0 (try 2)

webrtc/video/end_to_end_tests.cc

Index: webrtc/video/end_to_end_tests.cc
diff --git a/webrtc/video/end_to_end_tests.cc b/webrtc/video/end_to_end_tests.cc
index a936624d746c21d2b3545df426851a81a8e5c0b9..492f55d6ec8bf1863a0bb0f903d2f1f40f32d9fe 100644
--- a/webrtc/video/end_to_end_tests.cc
+++ b/webrtc/video/end_to_end_tests.cc
@@ -130,15 +130,6 @@
       Transport* transport);
 };
 
-void SetPacketizationMode(H264PacketizationMode mode, VideoEncoder* encoder) {
-  VideoCodec codec_settings;
-  codec_settings.codecType = kVideoCodecH264;
-  codec_settings.H264()->packetization_mode = mode;
-  // TODO(hta): Determine appropriate value for max packet size.
-  static const int kMaxPacketSize = 1024;
-  encoder->InitEncode(&codec_settings, 0, kMaxPacketSize);
-}
-
 TEST_F(EndToEndTest, ReceiverCanBeStartedTwice) {
   CreateCalls(Call::Config(&event_log_), Call::Config(&event_log_));
 
@@ -384,7 +375,7 @@
 }
 #endif  // !defined(RTC_DISABLE_VP9)
 
-#if defined(WEBRTC_USE_H264)
+#if defined(WEBRTC_END_TO_END_H264_TESTS)
 
 TEST_F(EndToEndTest, SendsAndReceivesH264) {
   CodecObserver test(500, kVideoRotation_0, "H264",
@@ -400,25 +391,7 @@
   RunBaseTest(&test);
 }
 
-TEST_F(EndToEndTest, SendsAndReceivesH264PacketizationMode0) {
-  VideoEncoder* encoder = VideoEncoder::Create(VideoEncoder::kH264);
-  SetPacketizationMode(kH264PacketizationMode0, encoder);
-  // The CodecObserver takes ownership of the encoder.
-  CodecObserver test(500, kVideoRotation_0, "H264", encoder,
-                     H264Decoder::Create());
-  RunBaseTest(&test);
-}
-
-TEST_F(EndToEndTest, SendsAndReceivesH264PacketizationMode1) {
-  VideoEncoder* encoder = VideoEncoder::Create(VideoEncoder::kH264);
-  SetPacketizationMode(kH264PacketizationMode1, encoder);
-  // The CodecObserver takes ownership of the encoder.
-  CodecObserver test(500, kVideoRotation_0, "H264", encoder,
-                     H264Decoder::Create());
-  RunBaseTest(&test);
-}
-
-#endif  // defined(WEBRTC_USE_H264)
+#endif  // defined(WEBRTC_END_TO_END_H264_TESTS)
 
 TEST_F(EndToEndTest, ReceiverUsesLocalSsrc) {
   class SyncRtcpObserver : public test::EndToEndTest {