Disable ChromePluginTest.Flash for Linux

chrome_plugin_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
@@ skipping 171 matching lines @@
         (*count)++;
       }
     }
     BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, quit_task);
   }
 };
 
 // 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;
   GetFlashPath(&flash_paths);
   if (flash_paths.empty()) {
     LOG(INFO) << "Test not running because couldn't find Flash.";
     return;
   }
 #endif
 
@@ skipping 50 matching lines @@
   std::vector<webkit::WebPluginInfo> plugins = GetPlugins();
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(expected); ++i) {
     size_t j = 0;
     for (; j < plugins.size(); ++j) {
       if (plugins[j].name == ASCIIToUTF16(expected[i]))
         break;
     }
     ASSERT_TRUE(j != plugins.size()) << "Didn't find " << expected[i];
   }
 }