Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4612)

Unified Diff: chrome/browser/media/chrome_webrtc_browsertest.cc

Issue 1715753002: Revert of Enable H.264 video WebRTC behind run-time flag and add WebRtcBrowserTest for H.264 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 9fb001ed2b337dd50463d32a8ba75eadb98e5eff..2e0b0f8aa904672e14cade38acd467e1743b5215 100644
--- a/chrome/browser/media/chrome_webrtc_browsertest.cc
+++ b/chrome/browser/media/chrome_webrtc_browsertest.cc
@@ -13,9 +13,7 @@
#include "chrome/common/chrome_switches.h"
#include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/ui_test_utils.h"
-#include "content/public/common/common_features.h"
#include "content/public/common/content_switches.h"
-#include "content/public/common/feature_h264_with_openh264_ffmpeg.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"
@@ -82,22 +80,6 @@
RunsAudioVideoWebRTCCallInTwoTabs("VP9");
}
-#if BUILDFLAG(RTC_USE_H264)
-
-IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest,
- RunsAudioVideoWebRTCCallInTwoTabsH264) {
- // Only run test if run-time feature corresponding to |rtc_use_h264| is on.
- if (!base::FeatureList::IsEnabled(content::kWebRtcH264WithOpenH264FFmpeg)) {
- LOG(WARNING) << "Run-time feature WebRtcH264WithOpenH264FFmpeg disabled. "
- "Skipping WebRtcBrowserTest.RunsAudioVideoWebRTCCallInTwoTabsH264 "
- "(test \"OK\")";
- return;
- }
- RunsAudioVideoWebRTCCallInTwoTabs("H264");
-}
-
-#endif // BUILDFLAG(RTC_USE_H264)
-
IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, TestWebAudioMediaStream) {
// This tests against crash regressions for the WebAudio-MediaStream
// integration.
« no previous file with comments | « no previous file | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698