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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/plugins/plugin_prefs_unittest.cc

Issue 645203002: Block NPAPI plugins by default (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: reorder initializers for clang Created 6 years, 2 months 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
« chrome/browser/content_settings/content_settings_browsertest.cc ('K') | « chrome/browser/content_settings/content_settings_browsertest.cc ('k') | chrome/browser/prerender/prerender_browsertest.cc » ('j') | chrome/browser/prerender/prerender_browsertest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/plugins/plugin_prefs_unittest.cc
diff --git a/chrome/browser/plugins/plugin_prefs_unittest.cc b/chrome/browser/plugins/plugin_prefs_unittest.cc
index 217a4ae938ef67c37e19dbcd74e67b1cdf55fa99..6da27bccd105ae8ed6034d0e57d5ad827c4b4661 100644
--- a/chrome/browser/plugins/plugin_prefs_unittest.cc
+++ b/chrome/browser/plugins/plugin_prefs_unittest.cc
@@ -210,6 +210,9 @@ TEST_F(PluginPrefsTest, UnifiedPepperFlashState) {
PluginService::GetInstance()->Init();
PluginService::GetInstance()->DisablePluginsDiscoveryForTesting();
+#if defined(OS_WIN) || defined(OS_MACOSX)
jam 2014/10/20 15:50:32 ditto?
Will Harris 2014/10/20 17:59:56 Done.
+ PluginService::GetInstance()->EnableNpapiPluginsForTesting();
+#endif
base::string16 component_updated_plugin_name(
ASCIIToUTF16("Component-updated Pepper Flash"));
« chrome/browser/content_settings/content_settings_browsertest.cc ('K') | « chrome/browser/content_settings/content_settings_browsertest.cc ('k') | chrome/browser/prerender/prerender_browsertest.cc » ('j') | chrome/browser/prerender/prerender_browsertest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698