| 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);
|
| }
|
|
|
|
|