summaryrefslogtreecommitdiffstats
path: root/content/browser/plugin_browsertest.cc
diff options
context:
space:
mode:
authorjschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-29 01:58:24 +0000
committerjschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-29 01:58:24 +0000
commitdc1a7fed64f98bde211a369187900d38f48dba3d (patch)
tree866e7daab1330caf953ba6df8ac54022e4146237 /content/browser/plugin_browsertest.cc
parent7678c3fb4cef6e7c3ff95f6c5cb8614d85f679d2 (diff)
downloadchromium_src-dc1a7fed64f98bde211a369187900d38f48dba3d.zip
chromium_src-dc1a7fed64f98bde211a369187900d38f48dba3d.tar.gz
chromium_src-dc1a7fed64f98bde211a369187900d38f48dba3d.tar.bz2
Disable remaining plugin test failures for Win64 build
These all pass locally, but they fail on the bots. BUG=180861 R=piman@chromium.org TBR=piman@chromium.org Review URL: https://chromiumcodereview.appspot.com/15891013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202742 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/plugin_browsertest.cc')
-rw-r--r--content/browser/plugin_browsertest.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/content/browser/plugin_browsertest.cc b/content/browser/plugin_browsertest.cc
index 4e613a5..9f93570 100644
--- a/content/browser/plugin_browsertest.cc
+++ b/content/browser/plugin_browsertest.cc
@@ -136,14 +136,14 @@ IN_PROC_BROWSER_TEST_F(PluginTest, UnloadNoCrash) {
// Tests if a plugin executing a self deleting script using NPN_GetURL
// works without crashing or hanging
// Flaky: http://crbug.com/59327
-IN_PROC_BROWSER_TEST_F(PluginTest, SelfDeletePluginGetUrl) {
+IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(SelfDeletePluginGetUrl)) {
LoadAndWait(GetURL("self_delete_plugin_geturl.html"));
}
// Tests if a plugin executing a self deleting script using Invoke
// works without crashing or hanging
// Flaky. See http://crbug.com/30702
-IN_PROC_BROWSER_TEST_F(PluginTest, SelfDeletePluginInvoke) {
+IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(SelfDeletePluginInvoke)) {
LoadAndWait(GetURL("self_delete_plugin_invoke.html"));
}
@@ -166,7 +166,7 @@ IN_PROC_BROWSER_TEST_F(PluginTest, NPObjectSetException) {
// This was never ported to Mac. The only thing remaining is to make
// SimulateMouseClick get to Mac plugins, currently it doesn't work.
IN_PROC_BROWSER_TEST_F(PluginTest,
- SelfDeletePluginInvokeInSynchronousMouseUp) {
+ MAYBE(SelfDeletePluginInvokeInSynchronousMouseUp)) {
NavigateToURL(shell(), GetURL("execute_script_delete_in_mouse_up.html"));
string16 expected_title(ASCIIToUTF16("OK"));
@@ -179,7 +179,7 @@ IN_PROC_BROWSER_TEST_F(PluginTest,
#endif
// Flaky, http://crbug.com/60071.
-IN_PROC_BROWSER_TEST_F(PluginTest, GetURLRequest404Response) {
+IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(GetURLRequest404Response)) {
GURL url(URLRequestMockHTTPJob::GetMockUrl(
base::FilePath().AppendASCII("npapi").
AppendASCII("plugin_url_request_404.html")));
@@ -189,7 +189,7 @@ IN_PROC_BROWSER_TEST_F(PluginTest, GetURLRequest404Response) {
// Tests if a plugin executing a self deleting script using Invoke with
// a modal dialog showing works without crashing or hanging
// Disabled, flakily exceeds timeout, http://crbug.com/46257.
-IN_PROC_BROWSER_TEST_F(PluginTest, SelfDeletePluginInvokeAlert) {
+IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(SelfDeletePluginInvokeAlert)) {
// Navigate asynchronously because if we waitd until it completes, there's a
// race condition where the alert can come up before we start watching for it.
shell()->LoadURL(GetURL("self_delete_plugin_invoke_alert.html"));
@@ -204,7 +204,7 @@ IN_PROC_BROWSER_TEST_F(PluginTest, SelfDeletePluginInvokeAlert) {
}
// Test passing arguments to a plugin.
-IN_PROC_BROWSER_TEST_F(PluginTest, Arguments) {
+IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(Arguments)) {
LoadAndWait(GetURL("arguments.html"));
}