summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_tests.gypi
diff options
context:
space:
mode:
authorcdn@google.com <cdn@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-10 21:45:26 +0000
committercdn@google.com <cdn@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-10 21:45:26 +0000
commitfa17868facdd8e74aeae12f3f4f1e0f45b3c0589 (patch)
treee88fa43b8d9e3c75744d3a930d594118aec88289 /chrome/chrome_tests.gypi
parent17b5d420bb0475f679270c61e06652a36c5578ae (diff)
downloadchromium_src-fa17868facdd8e74aeae12f3f4f1e0f45b3c0589.zip
chromium_src-fa17868facdd8e74aeae12f3f4f1e0f45b3c0589.tar.gz
chromium_src-fa17868facdd8e74aeae12f3f4f1e0f45b3c0589.tar.bz2
Merge 65212 - Don't whitelist extensions with NPAPI from no-prompt install.
BUG=61634 TEST=Browse to chrome.google.com/extensions, find an extension id, then open js console and enter chrome.webstorePrivate.install(<id>). The install should not prompt for confirmation, unless the extension uses NPAPI. Review URL: http://codereview.chromium.org/4443001 Review URL: http://codereview.chromium.org/4776001 git-svn-id: svn://svn.chromium.org/chrome/branches/552/src@65707 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_tests.gypi')
-rw-r--r--chrome/chrome_tests.gypi1
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index d08e00a..2bc02b0 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1919,6 +1919,7 @@
'browser/extensions/content_script_all_frames_apitest.cc',
'browser/extensions/content_script_extension_process_apitest.cc',
'browser/extensions/cross_origin_xhr_apitest.cc',
+ 'browser/extensions/crx_installer_browsertest.cc',
'browser/extensions/extension_devtools_browsertest.cc',
'browser/extensions/extension_devtools_browsertest.h',
'browser/extensions/extension_devtools_browsertests.cc',