Index: chrome/browser/media/chrome_webrtc_browsertest.cc |
diff --git a/chrome/browser/media/chrome_webrtc_browsertest.cc b/chrome/browser/media/chrome_webrtc_browsertest.cc |
index 2e0b0f8aa904672e14cade38acd467e1743b5215..be6d6c6e5eb3223c8f8a403709df724b80629bf6 100644 |
--- a/chrome/browser/media/chrome_webrtc_browsertest.cc |
+++ b/chrome/browser/media/chrome_webrtc_browsertest.cc |
@@ -14,6 +14,8 @@ |
#include "chrome/test/base/in_process_browser_test.h" |
#include "chrome/test/base/ui_test_utils.h" |
#include "content/public/common/content_switches.h" |
+#include "content/public/renderer/media/webrtc/finch_h264_with_openh264_ffmpeg.h" |
+#include "content/public/renderer/renderer_features.h" |
#include "content/public/test/browser_test_utils.h" |
#include "media/base/media_switches.h" |
#include "net/test/embedded_test_server/embedded_test_server.h" |
@@ -80,6 +82,22 @@ IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, |
RunsAudioVideoWebRTCCallInTwoTabs("VP9"); |
} |
+#if BUILDFLAG(RTC_USE_H264) |
+ |
+IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, |
+ RunsAudioVideoWebRTCCallInTwoTabsH264) { |
+ // Only run test if the Finch feature corresponding to |rtc_use_h264| is on. |
phoglund_chromium
2016/02/17 09:31:17
Nit: I prefer
if (finch not enabled) {
log warn
hbos_chromium
2016/02/17 10:28:24
Done.
|
+ if (base::FeatureList::IsEnabled(content::kWebRtcH264WithOpenH264FFmpeg)) { |
+ RunsAudioVideoWebRTCCallInTwoTabs("H264"); |
+ } else { |
+ LOG(WARNING) << "Finch feature WebRtcH264WithOpenH264FFmpeg disabled. " |
+ "Skipping WebRtcBrowserTest.RunsAudioVideoWebRTCCallInTwoTabsH264 " |
+ "(test \"OK\")"; |
+ } |
+} |
+ |
+#endif // BUILDFLAG(RTC_USE_H264) |
+ |
IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, TestWebAudioMediaStream) { |
// This tests against crash regressions for the WebAudio-MediaStream |
// integration. |