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

Unified Diff: chrome_plugin_browsertest.cc

Issue 11343026: Disable ChromePluginTest.Flash for Linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/chrome/browser/
Patch Set: Created 8 years, 2 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: chrome_plugin_browsertest.cc
===================================================================
--- chrome_plugin_browsertest.cc (revision 164752)
+++ chrome_plugin_browsertest.cc (working copy)
@@ -189,12 +189,7 @@
// Tests a bunch of basic scenarios with Flash.
// This test fails under ASan on Mac, see http://crbug.com/147004.
// It fails elsewhere, too. See http://crbug.com/152071.
-#if defined(ADDRESS_SANITIZER) || defined(OS_MACOSX) || defined(OS_WIN)
-#define MAYBE_Flash DISABLED_Flash
-#else
-#define MAYBE_Flash Flash
-#endif
-IN_PROC_BROWSER_TEST_F(ChromePluginTest, MAYBE_Flash) {
+IN_PROC_BROWSER_TEST_F(ChromePluginTest, DISABLED_Flash) {
// Official builds always have bundled Flash.
#if !defined(OFFICIAL_BUILD)
std::vector<FilePath> flash_paths;
« 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