Policy: Re-enabled plugin still disabled

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 187 matching lines @@
       NewCallback(this, &PluginsDOMHandler::HandleShowTermsOfServiceMessage));
 }
 
 void PluginsDOMHandler::HandleRequestPluginsData(const ListValue* args) {
   LoadPlugins();
 }
 
 void PluginsDOMHandler::HandleEnablePluginMessage(const ListValue* args) {
   // Be robust in accepting badness since plug-ins display HTML (hence
   // JavaScript).
-  if (args->GetSize() != 3)
+  if (args->GetSize() != 4)
     return;
 
   std::string enable_str;
   std::string is_group_str;
-  if (!args->GetString(1, &enable_str) || !args->GetString(2, &is_group_str))
+  if (!args->GetString(2, &enable_str) || !args->GetString(3, &is_group_str))
     return;
   bool enable = enable_str == "true";
 
   PluginUpdater* plugin_updater = PluginUpdater::GetInstance();
   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 adobereader = ASCIIToUTF16(
           webkit::npapi::PluginGroup::kAdobeReaderGroupName);
       string16 internalpdf = ASCIIToUTF16(PepperPluginRegistry::kPDFPluginName);
       if (group_name == adobereader) {
         plugin_updater->EnablePluginGroup(false, internalpdf);
       } else if (group_name == internalpdf) {
         plugin_updater->EnablePluginGroup(false, adobereader);
       }
     }
   } else {
+    string16 name;
     FilePath::StringType file_path;
-    if (!args->GetString(0, &file_path))
+    if (!args->GetString(0, &file_path) || !args->GetString(1, &name))
       return;
 
-    plugin_updater->EnablePluginFile(enable, file_path);
+    plugin_updater->EnablePlugin(enable, file_path, name);
   }
 
   // TODO(viettrungluu): We might also want to ensure that the plugins
   // list is always written to prefs even when the user hasn't disabled a
   // plugin. <http://crbug.com/39101>
   plugin_updater->UpdatePreferences(dom_ui_->GetProfile(), 0);
 }
 
 void PluginsDOMHandler::HandleShowTermsOfServiceMessage(const ListValue* args) {
   // Show it in a new browser window....
@@ skipping 80 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);
 }