diff options
| -rw-r--r-- | chrome/browser/extensions/extension_browsertests_misc.cc | 7 | ||||
| -rw-r--r-- | chrome/test/data/extensions/uitest/plugins/manifest.json | 6 |
2 files changed, 8 insertions, 5 deletions
diff --git a/chrome/browser/extensions/extension_browsertests_misc.cc b/chrome/browser/extensions/extension_browsertests_misc.cc index ac2dc06..c11cff3 100644 --- a/chrome/browser/extensions/extension_browsertests_misc.cc +++ b/chrome/browser/extensions/extension_browsertests_misc.cc @@ -708,12 +708,11 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, WindowOpenNoPrivileges) { EXPECT_TRUE(result); } -#if !defined(OS_WIN) +#if defined(OS_WIN) || defined(OS_LINUX) +#define MAYBE_PluginLoadUnload PluginLoadUnload +#else // TODO(mpcomplete): http://crbug.com/29900 need cross platform plugin support. #define MAYBE_PluginLoadUnload DISABLED_PluginLoadUnload -#else -// TODO(mpcomplete): http://crbug.com/40588 reenable after fixing. -#define MAYBE_PluginLoadUnload PluginLoadUnload #endif // Tests that a renderer's plugin list is properly updated when we load and diff --git a/chrome/test/data/extensions/uitest/plugins/manifest.json b/chrome/test/data/extensions/uitest/plugins/manifest.json index 94fb7b6..5478de7 100644 --- a/chrome/test/data/extensions/uitest/plugins/manifest.json +++ b/chrome/test/data/extensions/uitest/plugins/manifest.json @@ -2,5 +2,9 @@ "version": "1.0.0.0", "name": "NPAPI plugin test", "description": "An extension for an extension UITest.", - "plugins": [{"path": "plugin.dll", "public": true}] + "plugins": [ + {"path": "plugin.dll", "public": true}, + {"path": "plugin32.so", "public": true}, + {"path": "plugin64.so", "public": true} + ] } |