summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_ui_unittest.cc
diff options
context:
space:
mode:
authorcmasone@google.com <cmasone@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-18 15:47:50 +0000
committercmasone@google.com <cmasone@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-18 15:47:50 +0000
commit270eb8f84ec765617bab57c3af4c86763c3fc5a0 (patch)
tree739ee29b30412cbae0f3630623acc95b882404b3 /chrome/browser/extensions/extension_ui_unittest.cc
parent744b8ce09a82c7526fde335cb7f15ff64b963878 (diff)
downloadchromium_src-270eb8f84ec765617bab57c3af4c86763c3fc5a0.zip
chromium_src-270eb8f84ec765617bab57c3af4c86763c3fc5a0.tar.gz
chromium_src-270eb8f84ec765617bab57c3af4c86763c3fc5a0.tar.bz2
[Chrome OS] Block the installation of extensions with NPAPI plugins
BUG=chromium-os:5454 TEST=try to install http://www.3djam.com/roozz/roozz-plugin.crx, see that it is rejected. Try to install https://chrome.google.com/extensions/detail/gofhjkjmkpinhpoiabjplobcaignabnl, see that it works. And...unit tests Review URL: http://codereview.chromium.org/3163013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56529 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_ui_unittest.cc')
-rw-r--r--chrome/browser/extensions/extension_ui_unittest.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/extensions/extension_ui_unittest.cc b/chrome/browser/extensions/extension_ui_unittest.cc
index 96af1c8..f4075b6 100644
--- a/chrome/browser/extensions/extension_ui_unittest.cc
+++ b/chrome/browser/extensions/extension_ui_unittest.cc
@@ -85,6 +85,7 @@ TEST(ExtensionUITest, GenerateExtensionsJSONData) {
EXPECT_TRUE(CompareExpectedAndActualOutput(extension_path, pages,
expected_output_path)) << extension_path.value();
+#if !defined(OS_CHROMEOS)
// Test Extension2
extension_path = data_test_dir_path.AppendASCII("extensions")
.AppendASCII("good")
@@ -102,6 +103,7 @@ TEST(ExtensionUITest, GenerateExtensionsJSONData) {
EXPECT_TRUE(CompareExpectedAndActualOutput(extension_path, pages,
expected_output_path)) << extension_path.value();
+#endif
// Test Extension3
extension_path = data_test_dir_path.AppendASCII("extensions")