| 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;
|
|
|