Migrate enabled state of plugins into specialized Flash and PDF prefs.

chrome/browser/plugins/plugin_policy_handler.cc

Index: chrome/browser/plugins/plugin_policy_handler.cc
diff --git a/chrome/browser/plugins/plugin_policy_handler.cc b/chrome/browser/plugins/plugin_policy_handler.cc
index 06556d1ad3cb3d68059d328be0d402c42f6412d1..54fe7b7f41a0f3fb58bf9b1c88bd1686349981d0 100644
--- a/chrome/browser/plugins/plugin_policy_handler.cc
+++ b/chrome/browser/plugins/plugin_policy_handler.cc
@@ -20,8 +20,6 @@
 
 namespace {
 
-const char kAdobeFlashPlayerName[] = "Adobe Flash Player";
-
 // Retrieves a list typed policy or nullptr if not present or not a list.
 const base::ListValue* GetListPolicy(const policy::PolicyMap& policies,
                                      const std::string& policy) {
@@ -60,7 +58,7 @@ void PluginPolicyHandler::ProcessPolicy(const policy::PolicyMap& policies,
           prefs::kPluginsAlwaysOpenPdfExternally,
           base::MakeUnique<base::FundamentalValue>(disable_pdf_plugin));
     }
-    if ((base::MatchPattern(kAdobeFlashPlayerName, plugin) ||
+    if ((base::MatchPattern(content::kAdobeFlashPlayerPluginName, plugin) ||
          base::MatchPattern(content::kFlashPluginName, plugin)) &&
         !policies.GetValue(policy::key::kDefaultPluginsSetting)) {
       prefs->SetValue(
@@ -110,7 +108,7 @@ void PluginPolicyHandler::ApplyPolicySettings(const policy::PolicyMap& policies,
         !policies.GetValue(policy::key::kAlwaysOpenPdfExternally)) {
       prefs->RemoveValue(prefs::kPluginsAlwaysOpenPdfExternally);
     }
-    if ((base::MatchPattern(kAdobeFlashPlayerName, plugin) ||
+    if ((base::MatchPattern(content::kAdobeFlashPlayerPluginName, plugin) ||
          base::MatchPattern(content::kFlashPluginName, plugin)) &&
         !policies.GetValue(policy::key::kDefaultPluginsSetting)) {
       prefs->RemoveValue(prefs::kManagedDefaultPluginsSetting);