diff options
| author | asargent@chromium.org <asargent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-05 18:10:30 +0000 |
|---|---|---|
| committer | asargent@chromium.org <asargent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-05 18:10:30 +0000 |
| commit | 3fe952923afca7b464d7d5a427cffafe2d71959e (patch) | |
| tree | 1f43fae4934d7493e14cf0ea83fda62324366931 /chrome/browser/extensions/crx_installer_browsertest.cc | |
| parent | ebb090d01ffa509095e49d78f28574b8ed6cb669 (diff) | |
| download | chromium_src-3fe952923afca7b464d7d5a427cffafe2d71959e.zip chromium_src-3fe952923afca7b464d7d5a427cffafe2d71959e.tar.gz chromium_src-3fe952923afca7b464d7d5a427cffafe2d71959e.tar.bz2 | |
Don't run test with NPAPI extension on ChromeOS
BUG=none
TEST=The ExtensionCrxInstallerTest.Whitelisting browser_test should succeed on
ChromeOS
TBR=erikkay
Review URL: http://codereview.chromium.org/4560002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65221 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/crx_installer_browsertest.cc')
| -rw-r--r-- | chrome/browser/extensions/crx_installer_browsertest.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/extensions/crx_installer_browsertest.cc b/chrome/browser/extensions/crx_installer_browsertest.cc index ceb757d..535efc9 100644 --- a/chrome/browser/extensions/crx_installer_browsertest.cc +++ b/chrome/browser/extensions/crx_installer_browsertest.cc @@ -69,8 +69,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionCrxInstallerTest, Whitelisting) { // A regular extension should give no prompt. EXPECT_FALSE(DidWhitelistInstallPrompt("good.crx", "ldnnhddmnhbkjipkidpdiheffobcpfmf")); - +#if !defined(OS_CHROMEOS) // An extension with NPAPI should give a prompt. EXPECT_TRUE(DidWhitelistInstallPrompt("uitest/plugins.crx", "hdgllgikmikobbofgnabhfimcfoopgnd")); +#endif // !defined(OS_CHROMEOS } |