summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-22 00:29:15 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-22 00:31:21 +0000
commitb1a4853ae681febf5cc90f47e08de7ddf3b9f4ed (patch)
tree8b2e4c5412a923312a0139e5011315a80b5fe9d2
parentd0bafe629778c693c642fde72c973403c5d397d9 (diff)
downloadchromium_src-b1a4853ae681febf5cc90f47e08de7ddf3b9f4ed.zip
chromium_src-b1a4853ae681febf5cc90f47e08de7ddf3b9f4ed.tar.gz
chromium_src-b1a4853ae681febf5cc90f47e08de7ddf3b9f4ed.tar.bz2
Disable PluginTest.VerifyNPObjectLifetimeTest and PluginTest.CreateInstanceInPaint since they're flaking.
BUG=406184 TBR=avi@chromium.org Review URL: https://codereview.chromium.org/494243003 Cr-Commit-Position: refs/heads/master@{#291267} git-svn-id: svn://svn.chromium.org/chrome/trunk/src@291267 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--content/browser/plugin_browsertest.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/content/browser/plugin_browsertest.cc b/content/browser/plugin_browsertest.cc
index 67b606c..829fb5e 100644
--- a/content/browser/plugin_browsertest.cc
+++ b/content/browser/plugin_browsertest.cc
@@ -296,7 +296,8 @@ IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(VerifyPluginWindowRect)) {
// Tests that creating a new instance of a plugin while another one is handling
// a paint message doesn't cause deadlock.
-IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(CreateInstanceInPaint)) {
+// http://crbug.com/406184
+IN_PROC_BROWSER_TEST_F(PluginTest, DISABLED_CreateInstanceInPaint) {
LoadAndWait(GetURL("create_instance_in_paint.html"));
}
@@ -308,7 +309,8 @@ IN_PROC_BROWSER_TEST_F(PluginTest, DISABLED_AlertInWindowMessage) {
WaitForAppModalDialog(shell());
}
-IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(VerifyNPObjectLifetimeTest)) {
+// http://crbug.com/406184
+IN_PROC_BROWSER_TEST_F(PluginTest, DISABLED_VerifyNPObjectLifetimeTest) {
LoadAndWait(GetURL("npobject_lifetime_test.html"));
}