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

Unified Diff: content/browser/media/webrtc/webrtc_media_recorder_browsertest.cc

Issue 2147753002: VideoTrackRecorder: add support for texture backed ARGB VideoFrames (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: emircan@s comments Created 4 years, 5 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 | content/renderer/media/video_track_recorder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/media/webrtc/webrtc_media_recorder_browsertest.cc
diff --git a/content/browser/media/webrtc/webrtc_media_recorder_browsertest.cc b/content/browser/media/webrtc/webrtc_media_recorder_browsertest.cc
index ce386582bd0d7f43f345c4805ee11306673a2be8..c327deac8b779484c626e467387966a358f3ca8a 100644
--- a/content/browser/media/webrtc/webrtc_media_recorder_browsertest.cc
+++ b/content/browser/media/webrtc/webrtc_media_recorder_browsertest.cc
@@ -148,16 +148,7 @@ IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest,
kMediaRecorderHtmlFile);
}
-#if defined(OS_ANDROID)
-// TODO(cpaulin): when http://crbug.com/585242 is fixed, enable peer connection
-// recording test on android platform.
-#define MAYBE_MediaRecorderPeerConnection DISABLED_MediaRecorderPeerConnection
-#else
-#define MAYBE_MediaRecorderPeerConnection MediaRecorderPeerConnection
-#endif
-
-IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest,
- MAYBE_MediaRecorderPeerConnection) {
+IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, MediaRecorderPeerConnection) {
MakeTypicalCall("testRecordRemotePeerConnection();", kMediaRecorderHtmlFile);
}
« no previous file with comments | « no previous file | content/renderer/media/video_track_recorder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698