Cleanup: Disable WebRTC CaptureFromMediaElement test when using mojo renderer.

content/browser/webrtc/webrtc_capture_from_element_browsertest.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "base/strings/stringprintf.h"
 #include "content/browser/webrtc/webrtc_content_browsertest_base.h"
 #include "content/public/common/content_switches.h"
 #include "media/base/test_data_util.h"
 
 #if defined(ENABLE_MOJO_RENDERER)
 // Remote mojo renderer does not send audio/video frames back to the renderer
-// process and hence does not support capture: crbug.com/641559.
-#define DISABLE_CAPTURE_FROM_MEDIA_ELEMENT_TESTS 1
-#endif  // ENABLE_MOJO_RENDERER
+// process and hence does not support capture: https://crbug.com/641559.
+#define MAYBE_CaptureFromMediaElement DISABLED_CaptureFromMediaElement
+#else
+#define MAYBE_CaptureFromMediaElement CaptureFromMediaElement
+#endif
 
 namespace {
 
 static const char kCanvasTestHtmlPage[] = "/media/canvas_capture_color.html";
 
-#if !defined(DISABLE_CAPTURE_FROM_MEDIA_ELEMENT_TESTS)
 static const char kVideoAudioHtmlFile[] =
     "/media/video_audio_element_capture_test.html";
 
 static struct FileAndTypeParameters {
   bool has_video;
   bool has_audio;
   bool use_audio_tag;
   std::string filename;
 } const kFileAndTypeParameters[] = {
     {true, false, false, "bear-320x240-video-only.webm"},
     {false, true, false, "bear-320x240-audio-only.webm"},
     {true, true, false, "bear-320x240.webm"},
     {false, true, true, "bear-320x240-audio-only.webm"},
 };
-#endif  // DISABLE_CAPTURE_FROM_MEDIA_ELEMENT_TESTS
 
 }  // namespace
 
 namespace content {
 
 // This class is the browser tests for Media Capture from DOM Elements API,
 // which allows for creation of a MediaStream out of a <canvas>, <video> or
 // <audio> element.
 class WebRtcCaptureFromElementBrowserTest
     : public WebRtcContentBrowserTestBase,
@@ skipping 14 matching lines @@
 
  private:
   DISALLOW_COPY_AND_ASSIGN(WebRtcCaptureFromElementBrowserTest);
 };
 
 IN_PROC_BROWSER_TEST_F(WebRtcCaptureFromElementBrowserTest,
                        VerifyCanvasCaptureColor) {
   MakeTypicalCall("testCanvasCaptureColors();", kCanvasTestHtmlPage);
 }
 
-#if !defined(DISABLE_CAPTURE_FROM_MEDIA_ELEMENT_TESTS)
 IN_PROC_BROWSER_TEST_P(WebRtcCaptureFromElementBrowserTest,
-                       CaptureFromMediaElement) {
+                       MAYBE_CaptureFromMediaElement) {
   MakeTypicalCall(
       base::StringPrintf("testCaptureFromMediaElement(\"%s\", %d, %d, %d);",
                          GetParam().filename.c_str(),
                          GetParam().has_video,
                          GetParam().has_audio,
                          GetParam().use_audio_tag),
       kVideoAudioHtmlFile);
 }
 
 INSTANTIATE_TEST_CASE_P(,
                         WebRtcCaptureFromElementBrowserTest,
                         testing::ValuesIn(kFileAndTypeParameters));
-#endif  // !defined(DISABLE_CAPTURE_FROM_MEDIA_ELEMENT_TESTS)
 }  // namespace content