| Index: content/browser/webrtc/webrtc_getusermedia_browsertest.cc
|
| diff --git a/content/browser/webrtc/webrtc_getusermedia_browsertest.cc b/content/browser/webrtc/webrtc_getusermedia_browsertest.cc
|
| index 8899bb4b741d9d60173a9d1162da8a98ef67a8b4..8d604516f8ead779478dbd0a73876f7ace452a1e 100644
|
| --- a/content/browser/webrtc/webrtc_getusermedia_browsertest.cc
|
| +++ b/content/browser/webrtc/webrtc_getusermedia_browsertest.cc
|
| @@ -598,13 +598,19 @@ IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
|
| ExecuteJavascriptAndReturnResult(gum_with_vga_constraints));
|
| }
|
|
|
| +#if defined(OS_ANDROID) && defined(NDEBUG)
|
| +#define MAYBE_TraceVideoCaptureControllerPerformanceDuringGetUserMedia DISABLED_TraceVideoCaptureControllerPerformanceDuringGetUserMedia
|
| +#else
|
| +#define MAYBE_TraceVideoCaptureControllerPerformanceDuringGetUserMedia TraceVideoCaptureControllerPerformanceDuringGetUserMedia
|
| +#endif
|
| +
|
| // This test will make a simple getUserMedia page, verify that video is playing
|
| // in a simple local <video>, and for a couple of seconds, collect some
|
| // performance traces from VideoCaptureController colorspace conversion and
|
| // potential resizing.
|
| IN_PROC_BROWSER_TEST_F(
|
| WebRtcGetUserMediaBrowserTest,
|
| - TraceVideoCaptureControllerPerformanceDuringGetUserMedia) {
|
| + MAYBE_TraceVideoCaptureControllerPerformanceDuringGetUserMedia) {
|
| RunGetUserMediaAndCollectMeasures(
|
| 10,
|
| "VideoCaptureDeviceClient::OnIncomingCapturedData",
|
|
|