diff options
| author | dharani@google.com <dharani@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-30 00:18:00 +0000 |
|---|---|---|
| committer | dharani@google.com <dharani@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-30 00:18:00 +0000 |
| commit | 4eef28969b06dc858d3c914953fff9d9cecd8429 (patch) | |
| tree | 6c129a201575a723b76ee9ca54ff01f161aef1af /chrome/browser/chrome_plugin_browsertest.cc | |
| parent | 956a6a43424ba559af697d6548979c0523a615e5 (diff) | |
| download | chromium_src-4eef28969b06dc858d3c914953fff9d9cecd8429.zip chromium_src-4eef28969b06dc858d3c914953fff9d9cecd8429.tar.gz chromium_src-4eef28969b06dc858d3c914953fff9d9cecd8429.tar.bz2 | |
Disable ChromePluginTest.Flash for Linux
Bug=152071
Review URL: https://codereview.chromium.org/11343026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164785 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chrome_plugin_browsertest.cc')
| -rw-r--r-- | chrome/browser/chrome_plugin_browsertest.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/chrome/browser/chrome_plugin_browsertest.cc b/chrome/browser/chrome_plugin_browsertest.cc index a3e5e84..fbcb053 100644 --- a/chrome/browser/chrome_plugin_browsertest.cc +++ b/chrome/browser/chrome_plugin_browsertest.cc @@ -189,12 +189,7 @@ class ChromePluginTest : public InProcessBrowserTest { // 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; |