| 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);
|
|
|