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

chrome/browser/plugins/plugin_policy_handler.cc

 // Copyright (c) 2012 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/plugins/plugin_policy_handler.h"
 
 #include <string>
 
 #include "base/memory/ptr_util.h"
 #include "base/strings/pattern.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/plugins/plugin_prefs.h"
 #include "chrome/common/chrome_content_client.h"
 #include "chrome/common/pref_names.h"
 #include "components/content_settings/core/common/pref_names.h"
 #include "components/policy/core/browser/policy_error_map.h"
 #include "components/strings/grit/components_strings.h"
 #include "content/public/common/content_constants.h"
 
 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) {
   const base::Value* value = policies.GetValue(policy);
   if (!value)
     return nullptr;
 
   const base::ListValue* policy_value = nullptr;
   value->GetAsList(&policy_value);
   return policy_value;
@@ skipping 18 matching lines @@
   for (int i = 0; i < size; ++i) {
     std::string plugin;
     if (!plugins->GetString(i, &plugin))
       continue;
     if (base::MatchPattern(ChromeContentClient::kPDFPluginName, plugin) &&
         !policies.GetValue(policy::key::kAlwaysOpenPdfExternally)) {
       prefs->SetValue(
           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(
           prefs::kManagedDefaultPluginsSetting,
           base::MakeUnique<base::FundamentalValue>(flash_content_setting));
     }
   }
 }
 
 bool PluginPolicyHandler::CheckPolicySettings(const policy::PolicyMap& policies,
@@ skipping 29 matching lines @@
     return;
   const int size = plugins->GetSize();
   for (int i = 0; i < size; ++i) {
     std::string plugin;
     if (!plugins->GetString(i, &plugin))
       continue;
     if (base::MatchPattern(ChromeContentClient::kPDFPluginName, plugin) &&
         !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);
     }
   }
 }