diff options
author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-27 15:15:56 +0000 |
---|---|---|
committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-27 15:15:56 +0000 |
commit | 8c1407f75387bad1fcb722b4ea1b3f1f9bf0ae34 (patch) | |
tree | 213155b732bd4435f313a3ea46512eb132ed6bcf /content/browser/browser_plugin/browser_plugin_host_browsertest.cc | |
parent | c6a93f8e05b88100fa60232536938b0088ec573a (diff) | |
download | chromium_src-8c1407f75387bad1fcb722b4ea1b3f1f9bf0ae34.zip chromium_src-8c1407f75387bad1fcb722b4ea1b3f1f9bf0ae34.tar.gz chromium_src-8c1407f75387bad1fcb722b4ea1b3f1f9bf0ae34.tar.bz2 |
Disable BrowserPluginHostTest.GuestUnresponsive again.
Please do not enable this test again without rewriting it. It's always flaky.
BUG=164812
TBR=fsamuel
Review URL: https://codereview.chromium.org/12594031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190936 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/browser_plugin/browser_plugin_host_browsertest.cc')
-rw-r--r-- | content/browser/browser_plugin/browser_plugin_host_browsertest.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/content/browser/browser_plugin/browser_plugin_host_browsertest.cc b/content/browser/browser_plugin/browser_plugin_host_browsertest.cc index abbf63b..23977a5 100644 --- a/content/browser/browser_plugin/browser_plugin_host_browsertest.cc +++ b/content/browser/browser_plugin/browser_plugin_host_browsertest.cc @@ -375,7 +375,14 @@ class BrowserPluginHostTest : public ContentBrowserTest { // guest. // // Disabled on Windows and Linux since it is flaky. crbug.com/164812 -IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, GuestUnresponsive) { +// THIS TEST IS ALWAYS FLAKY. DO NOT ENABLE AGAIN WITHOUT REWRITING. +#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()); |