Merge 55541 - Re-enable the link to disable invididual plug-ins in a group....

chrome/common/plugin_group.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/common/plugin_group.h"
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "base/version.h"
@@ skipping 267 matching lines @@
     const WebPluginInfo& web_plugin = web_plugin_infos_[i];
     int priority = web_plugin_positions_[i];
     DictionaryValue* plugin_file = new DictionaryValue();
     plugin_file->SetStringFromUTF16(L"name", web_plugin.name);
     plugin_file->SetStringFromUTF16(L"description", web_plugin.desc);
     plugin_file->SetString(L"path", web_plugin.path.value());
     plugin_file->SetStringFromUTF16(L"version", web_plugin.version);
     bool plugin_disabled_by_policy = group_disabled_by_policy ||
         IsPluginNameDisabledByPolicy(web_plugin.name);
     if (plugin_disabled_by_policy) {
-      result->SetString(L"enabledMode", L"disabledByPolicy");
+      plugin_file->SetString(L"enabledMode", L"disabledByPolicy");
     } else {
-      result->SetString(L"enabledMode",
+      plugin_file->SetString(L"enabledMode",
                         web_plugin.enabled ? L"enabled" : L"disabledByUser");
     }
     plugin_file->SetInteger(L"priority", priority);
 
     ListValue* mime_types = new ListValue();
     for (std::vector<WebPluginMimeType>::const_iterator type_it =
          web_plugin.mime_types.begin();
          type_it != web_plugin.mime_types.end();
          ++type_it) {
       DictionaryValue* mime_type = new DictionaryValue();
@@ skipping 33 matching lines @@
        web_plugin_infos_.begin();
        it != web_plugin_infos_.end(); ++it) {
     if (enable && !IsPluginNameDisabledByPolicy(it->name)) {
       NPAPI::PluginList::Singleton()->EnablePlugin(FilePath(it->path));
     } else {
       NPAPI::PluginList::Singleton()->DisablePlugin(FilePath(it->path));
     }
   }
 }