| Index: content/browser/webrtc/webrtc_media_recorder_browsertest.cc
|
| diff --git a/content/browser/webrtc/webrtc_media_recorder_browsertest.cc b/content/browser/webrtc/webrtc_media_recorder_browsertest.cc
|
| index e60cffa8decdb367a497fcf1f4d7d476395b5ded..40b0613197d1f157feb7a659bc982fecc168d621 100644
|
| --- a/content/browser/webrtc/webrtc_media_recorder_browsertest.cc
|
| +++ b/content/browser/webrtc/webrtc_media_recorder_browsertest.cc
|
| @@ -141,7 +141,13 @@ IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest,
|
| kMediaRecorderHtmlFile);
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_P(WebRtcMediaRecorderTest, PeerConnection) {
|
| +// http://crbug.com/673126, flaky on Android.
|
| +#if defined(OS_ANDROID)
|
| +#define MAYBE_PeerConnection DISABLED_PeerConnection
|
| +#else
|
| +#define MAYBE_PeerConnection PeerConnection
|
| +#endif
|
| +IN_PROC_BROWSER_TEST_P(WebRtcMediaRecorderTest, MAYBE_PeerConnection) {
|
| MaybeForceDisableEncodeAccelerator(GetParam().disable_accelerator);
|
| MakeTypicalCall(base::StringPrintf("testRecordRemotePeerConnection(\"%s\");",
|
| GetParam().video_codec.c_str()),
|
|
|