| Index: content/browser/browser_plugin/browser_plugin_host_browsertest.cc
|
| diff --git a/content/browser/browser_plugin/browser_plugin_host_browsertest.cc b/content/browser/browser_plugin/browser_plugin_host_browsertest.cc
|
| index 9afcaca12af1ecf10e979a211c91df46bebe3e72..7518a5c8f7e20cc25c228b64a80be8f28920bdfc 100644
|
| --- a/content/browser/browser_plugin/browser_plugin_host_browsertest.cc
|
| +++ b/content/browser/browser_plugin/browser_plugin_host_browsertest.cc
|
| @@ -343,7 +343,15 @@ class BrowserPluginHostTest : public ContentBrowserTest {
|
|
|
| // This test loads a guest that has a busy loop, and therefore it hangs the
|
| // guest.
|
| -IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, GuestUnresponsive) {
|
| +//
|
| +// Disabled on Windows and Linux since it is flaky. crbug.com/164812
|
| +#if defined(OS_WIN) || defined(OS_LINUX)
|
| +#define MAYBE_GuestUnresponsive DISABLED_GuestUnresponsive
|
| +#else
|
| +#define MAYBE_GuestUnresponsive GuestUnresponsive
|
| +#endif
|
| +IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest,
|
| + MAYBE_GuestUnresponsive) {
|
| // Override the hang timeout for guest to be very small.
|
| content::BrowserPluginGuest::set_factory_for_testing(
|
| TestShortHangTimeoutGuestFactory::GetInstance());
|
|
|