Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1121)

Unified Diff: chrome/browser/extensions/crx_installer_browsertest.cc

Issue 4837003: Merge 65722 - Split the private webstore install API into two parts.... (Closed) Base URL: svn://svn.chromium.org/chrome/branches/552/src/
Patch Set: Created 10 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/extensions/extension_gallery_install_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/crx_installer_browsertest.cc
===================================================================
--- chrome/browser/extensions/crx_installer_browsertest.cc (revision 65899)
+++ chrome/browser/extensions/crx_installer_browsertest.cc (working copy)
@@ -55,6 +55,7 @@
mock_install_ui /* ownership transferred */));
installer->set_allow_silent_install(true);
+ installer->set_is_gallery_install(true);
CrxInstaller::SetWhitelistedInstallId(id);
FilePath crx_path = test_data_dir_.AppendASCII(crx_relpath);
@@ -69,8 +70,9 @@
// 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)
}
« no previous file with comments | « no previous file | chrome/browser/extensions/extension_gallery_install_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698