Enable NPAPI if policy has plugin policies.

chrome/browser/policy/configuration_policy_handler_list_factory.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/policy/configuration_policy_handler_list_factory.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/memory/scoped_vector.h"
 #include "base/values.h"
@@ skipping 43 matching lines @@
 #endif
 
 #if defined(ENABLE_EXTENSIONS)
 #include "chrome/browser/extensions/api/messaging/native_messaging_policy_handler.h"
 #include "chrome/browser/extensions/extension_management_constants.h"
 #include "chrome/browser/extensions/policy_handlers.h"
 #include "extensions/browser/pref_names.h"
 #include "extensions/common/manifest.h"
 #endif
 
+#if defined(ENABLE_PLUGINS)
+#include "chrome/browser/plugins/plugin_policy_handler.h"
+#endif
+
 namespace policy {
 
 namespace {
 
 // List of policy types to preference names. This is used for simple policies
 // that directly map to a single preference.
 const PolicyToPreferenceMapEntry kSimplePolicyMap[] = {
   { key::kHomepageLocation,
     prefs::kHomePage,
     base::Value::TYPE_STRING },
@@ skipping 41 matching lines @@
     base::Value::TYPE_BOOLEAN },
   { key::kDisablePrintPreview,
     prefs::kPrintPreviewDisabled,
     base::Value::TYPE_BOOLEAN },
   { key::kMetricsReportingEnabled,
     prefs::kMetricsReportingEnabled,
     base::Value::TYPE_BOOLEAN },
   { key::kApplicationLocaleValue,
     prefs::kApplicationLocale,
     base::Value::TYPE_STRING },
-  { key::kDisabledPlugins,
-    prefs::kPluginsDisabledPlugins,
-    base::Value::TYPE_LIST },
-  { key::kDisabledPluginsExceptions,
-    prefs::kPluginsDisabledPluginsExceptions,
-    base::Value::TYPE_LIST },
-  { key::kEnabledPlugins,
-    prefs::kPluginsEnabledPlugins,
-    base::Value::TYPE_LIST },
   { key::kShowHomeButton,
     prefs::kShowHomeButton,
     base::Value::TYPE_BOOLEAN },
   { key::kSavingBrowserHistoryDisabled,
     prefs::kSavingBrowserHistoryDisabled,
     base::Value::TYPE_BOOLEAN },
   { key::kAllowDeletingBrowserHistory,
     prefs::kAllowDeletingBrowserHistory,
     base::Value::TYPE_BOOLEAN },
   { key::kDeveloperToolsDisabled,
@@ skipping 31 matching lines @@
     base::Value::TYPE_LIST },
   { key::kImagesBlockedForUrls,
     prefs::kManagedImagesBlockedForUrls,
     base::Value::TYPE_LIST },
   { key::kJavaScriptAllowedForUrls,
     prefs::kManagedJavaScriptAllowedForUrls,
     base::Value::TYPE_LIST },
   { key::kJavaScriptBlockedForUrls,
     prefs::kManagedJavaScriptBlockedForUrls,
     base::Value::TYPE_LIST },
-  { key::kPluginsAllowedForUrls,
-    prefs::kManagedPluginsAllowedForUrls,
-    base::Value::TYPE_LIST },
-  { key::kPluginsBlockedForUrls,
-    prefs::kManagedPluginsBlockedForUrls,
-    base::Value::TYPE_LIST },
   { key::kPopupsAllowedForUrls,
     prefs::kManagedPopupsAllowedForUrls,
     base::Value::TYPE_LIST },
   { key::kPopupsBlockedForUrls,
     prefs::kManagedPopupsBlockedForUrls,
     base::Value::TYPE_LIST },
   { key::kNotificationsAllowedForUrls,
     prefs::kManagedNotificationsAllowedForUrls,
     base::Value::TYPE_LIST },
   { key::kNotificationsBlockedForUrls,
@@ skipping 285 matching lines @@
     base::Value::TYPE_BOOLEAN },
   { key::kBrowserGuestModeEnabled,
     prefs::kBrowserGuestModeEnabled,
     base::Value::TYPE_BOOLEAN },
   { key::kBrowserAddPersonEnabled,
     prefs::kBrowserAddPersonEnabled,
     base::Value::TYPE_BOOLEAN },
 #endif  // !defined(OS_CHROMEOS) && !defined(OS_ANDROID) && !defined(OS_IOS)
 };
 
+#if defined(ENABLE_PLUGINS)

[Mattias Nissler (ping if slow), 2015/04/10 08:47:15]

Nice!

[Will Harris, 2015/04/10 18:51:23]

Acknowledged.

+// List of policy types to preference names for plugin policies that will cause
+// NPAPI to be re-enabled.

[Mattias Nissler (ping if slow), 2015/04/10 08:47:15]

This makes it sound like these policy keys are just used for re-enabling NPAPI,
which is a bit misleading.

[Will Harris, 2015/04/10 18:51:23]

Acknowledged.

+const PolicyToPreferenceMapEntry kNpapiPluginsPolicyMap[] = {
+  { key::kEnabledPlugins,
+    prefs::kPluginsEnabledPlugins,
+    base::Value::TYPE_LIST },
+  { key::kDisabledPlugins,
+    prefs::kPluginsDisabledPlugins,
+    base::Value::TYPE_LIST },
+  { key::kDisabledPluginsExceptions,
+    prefs::kPluginsDisabledPluginsExceptions,
+    base::Value::TYPE_LIST },
+  { key::kPluginsAllowedForUrls,
+    prefs::kManagedPluginsAllowedForUrls,
+    base::Value::TYPE_LIST },
+  { key::kPluginsBlockedForUrls,
+    prefs::kManagedPluginsBlockedForUrls,
+    base::Value::TYPE_LIST },
+};
+#endif  // defined(ENABLE_PLUGINS)
+
 #if defined(ENABLE_EXTENSIONS)
 void GetExtensionAllowedTypesMap(
     ScopedVector<StringMappingListPolicyHandler::MappingEntry>* result) {
   // Mapping from extension type names to Manifest::Type.
   for (size_t index = 0;
        index < extensions::schema_constants::kAllowedTypesMapSize;
        ++index) {
     const extensions::schema_constants::AllowedTypesMapEntry& entry =
         extensions::schema_constants::kAllowedTypesMap[index];
     result->push_back(new StringMappingListPolicyHandler::MappingEntry(
@@ skipping 30 matching lines @@
   scoped_ptr<ConfigurationPolicyHandlerList> handlers(
       new ConfigurationPolicyHandlerList(
           base::Bind(&PopulatePolicyHandlerParameters),
           base::Bind(&GetChromePolicyDetails)));
   for (size_t i = 0; i < arraysize(kSimplePolicyMap); ++i) {
     handlers->AddHandler(make_scoped_ptr(new SimplePolicyHandler(
         kSimplePolicyMap[i].policy_name, kSimplePolicyMap[i].preference_path,
         kSimplePolicyMap[i].value_type)));
   }
 
+#if defined(ENABLE_PLUGINS)
+  for (size_t i = 0; i < arraysize(kNpapiPluginsPolicyMap); ++i) {
+    handlers->AddHandler(make_scoped_ptr(new PluginPolicyHandler(
+        kNpapiPluginsPolicyMap[i].policy_name,
+        kNpapiPluginsPolicyMap[i].preference_path,
+        kNpapiPluginsPolicyMap[i].value_type)));
+  }
+#endif
+
   handlers->AddHandler(make_scoped_ptr(new AutofillPolicyHandler()));
   handlers->AddHandler(make_scoped_ptr(new DefaultSearchPolicyHandler()));
   handlers->AddHandler(make_scoped_ptr(new IncognitoModePolicyHandler()));
   handlers->AddHandler(
       make_scoped_ptr(new ManagedBookmarksPolicyHandler(chrome_schema)));
   handlers->AddHandler(make_scoped_ptr(new ProxyPolicyHandler()));
   handlers->AddHandler(make_scoped_ptr(new URLBlacklistPolicyHandler()));
 
 #if defined(OS_ANDROID)
   handlers->AddHandler(
@@ skipping 185 matching lines @@
   handlers->AddHandler(make_scoped_ptr(new SimpleSchemaValidatingPolicyHandler(
       key::kSessionLocales, NULL, chrome_schema, SCHEMA_STRICT,
       SimpleSchemaValidatingPolicyHandler::RECOMMENDED_ALLOWED,
       SimpleSchemaValidatingPolicyHandler::MANDATORY_PROHIBITED)));
 #endif  // defined(OS_CHROMEOS)
 
   return handlers.Pass();
 }
 
 }  // namespace policy