diff options
author | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-11 08:39:49 +0000 |
---|---|---|
committer | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-11 08:39:49 +0000 |
commit | 960eec66d4556b8ea9791ccf25e2ee15df8663b8 (patch) | |
tree | 7b8adcb842168a38a84ff9a2a543f201fcb6e17a /chrome/test | |
parent | eec44d941cb60efe51454b593984199b7827d212 (diff) | |
download | chromium_src-960eec66d4556b8ea9791ccf25e2ee15df8663b8.zip chromium_src-960eec66d4556b8ea9791ccf25e2ee15df8663b8.tar.gz chromium_src-960eec66d4556b8ea9791ccf25e2ee15df8663b8.tar.bz2 |
Re-land: add support for blocking out-of-date plug-ins on Linux.
BUG=NONE
TEST=plugin_group_unittest.cc,plugin_lib_unittest.cc
TBR=bauerb@chromium.org
Review URL: http://codereview.chromium.org/6205004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71024 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r-- | chrome/test/plugin/plugin_test.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/test/plugin/plugin_test.cpp b/chrome/test/plugin/plugin_test.cpp index 177ad5f..ad1d777 100644 --- a/chrome/test/plugin/plugin_test.cpp +++ b/chrome/test/plugin/plugin_test.cpp @@ -124,7 +124,7 @@ class PluginTest : public UITest { }; // http://crbug.com/68303 -#if defined(OS_MACOSX) +#if defined(OS_MACOSX) || defined(OS_LINUX) TEST_F(PluginTest, DISABLED_Flash) { #else TEST_F(PluginTest, Flash) { |