Add a policy to re-enable deprecated web platform features.

chrome/browser/policy/configuration_policy_handler_list_factory.cc

Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc
diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
index 0741e6e9590076c778dd423ffb1a3675260b7ec6..2a47ba1adf2831f887e7653d275ef1c88e4044c7 100644
--- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
+++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
@@ -12,6 +12,7 @@
 #include "chrome/browser/policy/managed_bookmarks_policy_handler.h"
 #include "chrome/browser/profiles/incognito_mode_policy_handler.h"
 #include "chrome/browser/search_engines/default_search_policy_handler.h"
+#include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "components/password_manager/core/common/password_manager_pref_names.h"
 #include "components/policy/core/browser/autofill_policy_handler.h"
@@ -491,25 +492,35 @@ void GetExtensionAllowedTypesMap(
     ScopedVector<StringMappingListPolicyHandler::MappingEntry>* result) {
   // Mapping from extension type names to Manifest::Type.
   result->push_back(new StringMappingListPolicyHandler::MappingEntry(
-      "extension", scoped_ptr<base::Value>(base::Value::CreateIntegerValue(
+      "extension", scoped_ptr<base::Value>(new base::FundamentalValue(
           extensions::Manifest::TYPE_EXTENSION))));
   result->push_back(new StringMappingListPolicyHandler::MappingEntry(
-      "theme", scoped_ptr<base::Value>(base::Value::CreateIntegerValue(
+      "theme", scoped_ptr<base::Value>(new base::FundamentalValue(
           extensions::Manifest::TYPE_THEME))));
   result->push_back(new StringMappingListPolicyHandler::MappingEntry(
-      "user_script", scoped_ptr<base::Value>(base::Value::CreateIntegerValue(
+      "user_script", scoped_ptr<base::Value>(new base::FundamentalValue(
           extensions::Manifest::TYPE_USER_SCRIPT))));
   result->push_back(new StringMappingListPolicyHandler::MappingEntry(
-      "hosted_app", scoped_ptr<base::Value>(base::Value::CreateIntegerValue(
+      "hosted_app", scoped_ptr<base::Value>(new base::FundamentalValue(
           extensions::Manifest::TYPE_HOSTED_APP))));
   result->push_back(new StringMappingListPolicyHandler::MappingEntry(
-      "legacy_packaged_app", scoped_ptr<base::Value>(
-          base::Value::CreateIntegerValue(
-              extensions::Manifest::TYPE_LEGACY_PACKAGED_APP))));
+      "legacy_packaged_app", scoped_ptr<base::Value>(new base::FundamentalValue(
+          extensions::Manifest::TYPE_LEGACY_PACKAGED_APP))));
   result->push_back(new StringMappingListPolicyHandler::MappingEntry(
-      "platform_app", scoped_ptr<base::Value>(base::Value::CreateIntegerValue(
+      "platform_app", scoped_ptr<base::Value>(new base::FundamentalValue(
           extensions::Manifest::TYPE_PLATFORM_APP))));
 }
+
+void GetDeprecatedFeaturesMap(
+    ScopedVector<StringMappingListPolicyHandler::MappingEntry>* result) {
+  // Maps feature tags as specified in policy to the corresponding switch to
+  // re-enable them.
+  // TODO: Remove after 2015-04-30 per http://crbug.com/374782.
+  result->push_back(new StringMappingListPolicyHandler::MappingEntry(
+      "ShowModalDialog_EffectiveUntil20150430",
+      scoped_ptr<base::Value>(new base::StringValue(
+          switches::kEnableShowModalDialog))));
+}
 #endif  // !defined(OS_IOS)
 
 }  // namespace
@@ -581,6 +592,11 @@ scoped_ptr<ConfigurationPolicyHandlerList> BuildHandlerList(
           key::kExtensionAllowedTypes,
           extensions::pref_names::kAllowedTypes,
           base::Bind(GetExtensionAllowedTypesMap))));
+  handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>(
+      new StringMappingListPolicyHandler(
+          key::kEnableDeprecatedWebPlatformFeatures,
+          prefs::kEnableDeprecatedWebPlatformFeatures,
+          base::Bind(GetDeprecatedFeaturesMap))));
 #endif  // !defined(OS_IOS)
 
 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) && !defined(OS_IOS)