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

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

Issue 14863010: Disables couple of other flaky TabCaptureApiTests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | 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 dc3c75a0d018191c5e9c5f73c79681b9d2d0a7a2..2c6a282142a6ff24cbb537d74845f2e838c631b5 100644
--- a/chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc
+++ b/chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc
@@ -92,8 +92,14 @@ IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, DISABLED_EndToEnd) {
"end_to_end.html")) << message_;
}
+// Flaky http://crbug.com/224249
+#if defined(OS_WIN)
+#define MAYBE_GetUserMediaTest DISABLED_GetUserMediaTest
+#else
+#define MAYBE_GetUserMediaTest GetUserMediaTest
+#endif
// Test that we can't get tabCapture streams using GetUserMedia directly.
-IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, GetUserMediaTest) {
+IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, MAYBE_GetUserMediaTest) {
ExtensionTestMessageListener listener("ready", true);
ASSERT_TRUE(RunExtensionSubtest("tab_capture/experimental",
@@ -117,9 +123,15 @@ IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, GetUserMediaTest) {
EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
}
+// Flaky http://crbug.com/224249
+#if defined(OS_WIN)
+#define MAYBE_ActiveTabPermission DISABLED_ActiveTabPermission
+#else
+#define MAYBE_ActiveTabPermission ActiveTabPermission
+#endif
// Make sure tabCapture.capture only works if the tab has been granted
// permission via an extension icon click or the extension is whitelisted.
-IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, ActiveTabPermission) {
+IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, MAYBE_ActiveTabPermission) {
ExtensionTestMessageListener before_open_tab("ready1", true);
ExtensionTestMessageListener before_grant_permission("ready2", true);
ExtensionTestMessageListener before_open_new_tab("ready3", true);
« 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