From 445fb8fa4fd27b7e49b0555fc47b29d0d98f2496 Mon Sep 17 00:00:00 2001
From: brandtr <brandtr@webrtc.org>
Date: Mon, 14 Nov 2016 04:11:23 -0800
Subject: [PATCH] Use correct define in H264 end-to-end tests.

Right now, the H264 end-to-end tests are not run on the bots.

BUG=None

Review-Url: https://codereview.webrtc.org/2484913007
Cr-Commit-Position: refs/heads/master@{#15062}
---
 webrtc/video/BUILD.gn            | 3 +++
 webrtc/video/end_to_end_tests.cc | 6 ++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/webrtc/video/BUILD.gn b/webrtc/video/BUILD.gn
index e97de6f2e5..b163e7ac8a 100644
--- a/webrtc/video/BUILD.gn
+++ b/webrtc/video/BUILD.gn
@@ -170,5 +170,8 @@ if (rtc_include_tests) {
       # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
       suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
     }
+    if (rtc_use_h264) {
+      defines = [ "WEBRTC_USE_H264" ]
+    }
   }
 }
diff --git a/webrtc/video/end_to_end_tests.cc b/webrtc/video/end_to_end_tests.cc
index 492f55d6ec..fcd3c5cfb7 100644
--- a/webrtc/video/end_to_end_tests.cc
+++ b/webrtc/video/end_to_end_tests.cc
@@ -375,8 +375,7 @@ TEST_F(EndToEndTest, SendsAndReceivesVP9VideoRotation90) {
 }
 #endif  // !defined(RTC_DISABLE_VP9)
 
-#if defined(WEBRTC_END_TO_END_H264_TESTS)
-
+#if defined(WEBRTC_USE_H264)
 TEST_F(EndToEndTest, SendsAndReceivesH264) {
   CodecObserver test(500, kVideoRotation_0, "H264",
                      VideoEncoder::Create(VideoEncoder::kH264),
@@ -390,8 +389,7 @@ TEST_F(EndToEndTest, SendsAndReceivesH264VideoRotation90) {
                      H264Decoder::Create());
   RunBaseTest(&test);
 }
-
-#endif  // defined(WEBRTC_END_TO_END_H264_TESTS)
+#endif  // defined(WEBRTC_USE_H264)
 
 TEST_F(EndToEndTest, ReceiverUsesLocalSsrc) {
   class SyncRtcpObserver : public test::EndToEndTest {