Merge PluginGroups for Adobe Reader

chrome/browser/dom_ui/plugins_ui.cc

 // Copyright (c) 2010 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/dom_ui/plugins_ui.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 205 matching lines @@
 
   PluginUpdater* plugin_updater = PluginUpdater::GetPluginUpdater();
   if (is_group_str == "true") {
     string16 group_name;
     if (!args->GetString(0, &group_name))
       return;
 
     plugin_updater->EnablePluginGroup(enable, group_name);
     if (enable) {
       // See http://crbug.com/50105 for background.
-      string16 reader8 = ASCIIToUTF16(PluginGroup::kAdobeReader8GroupName);
-      string16 reader9 = ASCIIToUTF16(PluginGroup::kAdobeReader9GroupName);
+      string16 adobereader = ASCIIToUTF16(PluginGroup::kAdobeReaderGroupName);
       string16 internalpdf = ASCIIToUTF16(PepperPluginRegistry::kPDFPluginName);
-      if (group_name == reader8 || group_name == reader9) {
+      if (group_name == adobereader) {
         plugin_updater->EnablePluginGroup(false, internalpdf);
       } else if (group_name == internalpdf) {
-        plugin_updater->EnablePluginGroup(false, reader8);
-        plugin_updater->EnablePluginGroup(false, reader9);
+        plugin_updater->EnablePluginGroup(false, adobereader);
       }
     }
   } else {
     FilePath::StringType file_path;
     if (!args->GetString(0, &file_path))
       return;
 
     plugin_updater->EnablePluginFile(enable, file_path);
   }
 
@@ skipping 88 matching lines @@
 void PluginsUI::RegisterUserPrefs(PrefService* prefs) {
   FilePath internal_dir;
   PathService::Get(chrome::DIR_INTERNAL_PLUGINS, &internal_dir);
   prefs->RegisterFilePathPref(prefs::kPluginsLastInternalDirectory,
                               internal_dir);
 
   prefs->RegisterListPref(prefs::kPluginsPluginsBlacklist);
   prefs->RegisterListPref(prefs::kPluginsPluginsList);
   prefs->RegisterBooleanPref(prefs::kPluginsEnabledInternalPDF, false);
 }