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

Side by Side Diff: content/browser/webrtc/webrtc_capture_from_element_browsertest.cc

Issue 2835973002: Disabling flaky WebRtcCaptureFromElementBrowserTest.VerifyCanvasWebGLCaptureColor on android (Closed)
Patch Set: Created 3 years, 8 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/strings/stringprintf.h" 6 #include "base/strings/stringprintf.h"
7 #include "content/browser/webrtc/webrtc_content_browsertest_base.h" 7 #include "content/browser/webrtc/webrtc_content_browsertest_base.h"
8 #include "content/public/common/content_switches.h" 8 #include "content/public/common/content_switches.h"
9 #include "media/base/test_data_util.h" 9 #include "media/base/test_data_util.h"
10 10
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 private: 71 private:
72 DISALLOW_COPY_AND_ASSIGN(WebRtcCaptureFromElementBrowserTest); 72 DISALLOW_COPY_AND_ASSIGN(WebRtcCaptureFromElementBrowserTest);
73 }; 73 };
74 74
75 IN_PROC_BROWSER_TEST_F(WebRtcCaptureFromElementBrowserTest, 75 IN_PROC_BROWSER_TEST_F(WebRtcCaptureFromElementBrowserTest,
76 VerifyCanvas2DCaptureColor) { 76 VerifyCanvas2DCaptureColor) {
77 MakeTypicalCall("testCanvas2DCaptureColors();", 77 MakeTypicalCall("testCanvas2DCaptureColors();",
78 kCanvasCaptureColorTestHtmlFile); 78 kCanvasCaptureColorTestHtmlFile);
79 } 79 }
80 80
81 #if defined(OS_ANDROID)
82 // Remote mojo renderer does not send audio/video frames back to the renderer
83 // process and hence does not support capture: https://crbug.com/641559.
84 #define MAYBE_VerifyCanvasWebGLCaptureColor \
85 DISABLED_VerifyCanvasWebGLCaptureColor
86 #else
87 #define MAYBE_VerifyCanvasWebGLCaptureColor VerifyCanvasWebGLCaptureColor
88 #endif
81 IN_PROC_BROWSER_TEST_F(WebRtcCaptureFromElementBrowserTest, 89 IN_PROC_BROWSER_TEST_F(WebRtcCaptureFromElementBrowserTest,
82 VerifyCanvasWebGLCaptureColor) { 90 MAYBE_VerifyCanvasWebGLCaptureColor) {
83 #if !defined(OS_MACOSX) 91 #if !defined(OS_MACOSX)
84 // TODO(crbug.com/706009): Make this test pass on mac. Behavior is not buggy 92 // TODO(crbug.com/706009): Make this test pass on mac. Behavior is not buggy
85 // (verified manually) on mac, but for some reason this test fails on the mac 93 // (verified manually) on mac, but for some reason this test fails on the mac
86 // bot. 94 // bot.
87 MakeTypicalCall("testCanvasWebGLCaptureColors();", 95 MakeTypicalCall("testCanvasWebGLCaptureColors();",
88 kCanvasCaptureColorTestHtmlFile); 96 kCanvasCaptureColorTestHtmlFile);
89 #endif 97 #endif
90 } 98 }
91 99
92 IN_PROC_BROWSER_TEST_F(WebRtcCaptureFromElementBrowserTest, 100 IN_PROC_BROWSER_TEST_F(WebRtcCaptureFromElementBrowserTest,
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 GetParam().has_video, 137 GetParam().has_video,
130 GetParam().has_audio, 138 GetParam().has_audio,
131 GetParam().use_audio_tag), 139 GetParam().use_audio_tag),
132 kVideoAudioHtmlFile); 140 kVideoAudioHtmlFile);
133 } 141 }
134 142
135 INSTANTIATE_TEST_CASE_P(, 143 INSTANTIATE_TEST_CASE_P(,
136 WebRtcCaptureFromElementBrowserTest, 144 WebRtcCaptureFromElementBrowserTest,
137 testing::ValuesIn(kFileAndTypeParameters)); 145 testing::ValuesIn(kFileAndTypeParameters));
138 } // namespace content 146 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698