diff options
| author | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-18 17:46:36 +0000 |
|---|---|---|
| committer | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-18 17:46:36 +0000 |
| commit | dabbeb8b81e3712b1b2c2d5a8b76831f64995b35 (patch) | |
| tree | 74334d5dd10e8ab4013aaca37b8d65d3d87764a6 /chrome/test/ui | |
| parent | 2975326eca211f79a410ea4865d7ed333a1be716 (diff) | |
| download | chromium_src-dabbeb8b81e3712b1b2c2d5a8b76831f64995b35.zip chromium_src-dabbeb8b81e3712b1b2c2d5a8b76831f64995b35.tar.gz chromium_src-dabbeb8b81e3712b1b2c2d5a8b76831f64995b35.tar.bz2 | |
Enable windowless-based npapi_test_plugin tests on the Mac.
BUG=30488
TEST=N/A
Review URL: http://codereview.chromium.org/501074
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34959 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/ui')
| -rw-r--r-- | chrome/test/ui/npapi_uitest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/test/ui/npapi_uitest.cc b/chrome/test/ui/npapi_uitest.cc index 4a8168b..13ec73f 100644 --- a/chrome/test/ui/npapi_uitest.cc +++ b/chrome/test/ui/npapi_uitest.cc @@ -163,7 +163,7 @@ TEST_F(NPAPITester, DISABLED_SelfDeletePluginInvokeAlert) { kShortWaitTimeout); } -#if defined(OS_WIN) +#if defined(OS_WIN) || defined(OS_MACOSX) // Tests if a plugin executing a self deleting script in the context of // a synchronous paint event works correctly TEST_F(NPAPIVisiblePluginTester, @@ -323,7 +323,7 @@ TEST_F(NPAPIIncognitoTester, PrivateEnabled) { kTestCompleteSuccess, kShortWaitTimeout); } -#if defined(OS_WIN) +#if defined(OS_WIN) || defined(OS_MACOSX) // Test a browser hang due to special case of multiple // plugin instances indulged in sync calls across renderer. TEST_F(NPAPIVisiblePluginTester, MultipleInstancesSyncCalls) { |