summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_startup_browsertest.cc
diff options
context:
space:
mode:
authormpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-29 18:45:56 +0000
committermpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-29 18:45:56 +0000
commitb8fb303f7d06e12ec26d68330873400d53e91b47 (patch)
treeea9528c2eeddc71ddefeb75f1906593521cf0dfc /chrome/browser/extensions/extension_startup_browsertest.cc
parent6da72f588fd7ff3c89b637930c09bb7bf1c15db4 (diff)
downloadchromium_src-b8fb303f7d06e12ec26d68330873400d53e91b47.zip
chromium_src-b8fb303f7d06e12ec26d68330873400d53e91b47.tar.gz
chromium_src-b8fb303f7d06e12ec26d68330873400d53e91b47.tar.bz2
Allow extensions with NPAPI plugins to install on ChromeOS, just don't allow the plugin to run.
BUG=80619 TEST=unit tests Review URL: http://codereview.chromium.org/6904105 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83560 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_startup_browsertest.cc')
-rw-r--r--chrome/browser/extensions/extension_startup_browsertest.cc6
1 files changed, 0 insertions, 6 deletions
diff --git a/chrome/browser/extensions/extension_startup_browsertest.cc b/chrome/browser/extensions/extension_startup_browsertest.cc
index 65dc1d7..dc046a1 100644
--- a/chrome/browser/extensions/extension_startup_browsertest.cc
+++ b/chrome/browser/extensions/extension_startup_browsertest.cc
@@ -28,13 +28,7 @@
class ExtensionStartupTestBase : public InProcessBrowserTest {
public:
ExtensionStartupTestBase() : enable_extensions_(false) {
-#if defined(OS_CHROMEOS)
- // Chromeos disallows extensions with NPAPI plug-ins, so it's count is one
- // less
- num_expected_extensions_ = 2;
-#else
num_expected_extensions_ = 3;
-#endif
}
protected: