diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-24 08:00:40 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-24 08:00:40 +0000 |
| commit | 569ca4f6cc7d13349418ff23f30746caf7c26d26 (patch) | |
| tree | 6ad64ce20eb1d747d9c17ca16706f03f9782e490 /chrome | |
| parent | 81c4864633619b46ac8e262f1db5956878e8fb17 (diff) | |
| download | chromium_src-569ca4f6cc7d13349418ff23f30746caf7c26d26.zip chromium_src-569ca4f6cc7d13349418ff23f30746caf7c26d26.tar.gz chromium_src-569ca4f6cc7d13349418ff23f30746caf7c26d26.tar.bz2 | |
Linux: Port the ExtensionBrowserTest.PluginLoadUnload test part 2. (TTF)
BUG=29900
TEST=ported.
Review URL: http://codereview.chromium.org/2849019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50707 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -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} + ] } |