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

Unified Diff: chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc

Issue 1456863003: Disable failing tests on Mac 10.10 Release (ATI) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/extensions/api/cast_streaming/cast_streaming_apitest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc
diff --git a/chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc b/chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc
index 7bcba9bbf1563892df370ab6896218fdeed2ffd6..e0012e7b82e2ccb4fcc73283ff02b059458953fb 100644
--- a/chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc
+++ b/chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc
@@ -174,7 +174,13 @@ IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, MaxOffscreenTabs) {
}
// Tests that tab capture video frames can be received in a VIDEO element.
-IN_PROC_BROWSER_TEST_F(TabCaptureApiPixelTest, EndToEndWithoutRemoting) {
+// Disabled in MacOS: https://crbug.com/557929
+#if defined(OS_MACOSX)
+#define MAYBE_EndToEndWithoutRemoting DISABLED_EndToEndWithoutRemoting
+#else
+#define MAYBE_EndToEndWithoutRemoting EndToEndWithoutRemoting
+#endif
+IN_PROC_BROWSER_TEST_F(TabCaptureApiPixelTest, MAYBE_EndToEndWithoutRemoting) {
if (IsTooIntensiveForThisPlatform()) {
LOG(WARNING) << "Skipping this CPU-intensive test on this platform/build.";
return;
@@ -189,7 +195,13 @@ IN_PROC_BROWSER_TEST_F(TabCaptureApiPixelTest, EndToEndWithoutRemoting) {
// received in a VIDEO element. More allowance is provided for color deviation
// because of the additional layers of video processing performed within
// WebRTC.
-IN_PROC_BROWSER_TEST_F(TabCaptureApiPixelTest, EndToEndThroughWebRTC) {
+// Disabled in MacOS: https://crbug.com/557929
+#if defined(OS_MACOSX)
+#define MAYBE_EndToEndThroughWebRTC DISABLED_EndToEndThroughWebRTC
+#else
+#define MAYBE_EndToEndThroughWebRTC EndToEndThroughWebRTC
+#endif
+IN_PROC_BROWSER_TEST_F(TabCaptureApiPixelTest, MAYBE_EndToEndThroughWebRTC) {
if (IsTooIntensiveForThisPlatform()) {
LOG(WARNING) << "Skipping this CPU-intensive test on this platform/build.";
return;
« no previous file with comments | « chrome/browser/extensions/api/cast_streaming/cast_streaming_apitest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698