Enable NPAPI plugins if any plugin policies are set.

chrome/browser/plugins/plugin_prefs_unittest.cc

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 70deb5de3c541ad67413657875f276f6f668885e..49c76c01e314803ed02f50fe644b94ac6d653cae 100644
--- a/chrome/browser/plugins/plugin_prefs_unittest.cc
+++ b/chrome/browser/plugins/plugin_prefs_unittest.cc
@@ -208,7 +208,6 @@ TEST_F(PluginPrefsTest, UnifiedPepperFlashState) {
 
   PluginService::GetInstance()->Init();
   PluginService::GetInstance()->DisablePluginsDiscoveryForTesting();
-  PluginService::GetInstance()->EnableNpapiPluginsForTesting();
 
   base::string16 component_updated_plugin_name(
       ASCIIToUTF16("Component-updated Pepper Flash"));
@@ -226,6 +225,12 @@ TEST_F(PluginPrefsTest, UnifiedPepperFlashState) {
                                         GetBundledPepperFlashPath(),
                                         ASCIIToUTF16("11.3.31.229"),
                                         ASCIIToUTF16(""));
+  component_updated_plugin_1.type =
+      content::WebPluginInfo::PLUGIN_TYPE_PEPPER_OUT_OF_PROCESS;
+  component_updated_plugin_2.type =
+      content::WebPluginInfo::PLUGIN_TYPE_PEPPER_OUT_OF_PROCESS;
+  bundled_plugin.type =
+      content::WebPluginInfo::PLUGIN_TYPE_PEPPER_OUT_OF_PROCESS;
 
   PluginService::GetInstance()->RegisterInternalPlugin(
       component_updated_plugin_1, false);