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

Unified Diff: content/browser/plugin_browsertest.cc

Issue 12610005: Disable failing plugin tests on Win64 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 9 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: content/browser/plugin_browsertest.cc
===================================================================
--- content/browser/plugin_browsertest.cc (revision 185833)
+++ content/browser/plugin_browsertest.cc (working copy)
@@ -21,6 +21,13 @@
#include "base/win/registry.h"
#endif
+// TODO(jschuh): Finish plugins on Win64. crbug.com/180861
+#if defined(OS_WIN) && defined(ARCH_CPU_X86_64)
+#define MAYBE(x) DISABLED_##x
+#else
+#define MAYBE(x) x
+#endif
+
namespace content {
namespace {
@@ -277,7 +284,7 @@
// 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, CreateInstanceInPaint) {
+IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(CreateInstanceInPaint)) {
LoadAndWait(GetURL("create_instance_in_paint.html"));
}
@@ -298,11 +305,12 @@
LoadAndWait(GetURL("new_fails.html"));
}
-IN_PROC_BROWSER_TEST_F(PluginTest, SelfDeletePluginInNPNEvaluate) {
+IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(SelfDeletePluginInNPNEvaluate)) {
LoadAndWait(GetURL("execute_script_delete_in_npn_evaluate.html"));
}
-IN_PROC_BROWSER_TEST_F(PluginTest, SelfDeleteCreatePluginInNPNEvaluate) {
+IN_PROC_BROWSER_TEST_F(PluginTest,
+ MAYBE(SelfDeleteCreatePluginInNPNEvaluate)) {
LoadAndWait(GetURL("npn_plugin_delete_create_in_evaluate.html"));
}
@@ -414,7 +422,7 @@
// TODO(port) Port the following tests to platforms that have the required
// plugins.
// Flaky: http://crbug.com/55915
-IN_PROC_BROWSER_TEST_F(PluginTest, Quicktime) {
+IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(Quicktime)) {
TestPlugin("quicktime.html");
}
« 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