Fixed grave bug in Plugin Loading code that lead to a crash with some plugins.

webkit/plugins/npapi/plugin_list.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 "webkit/plugins/npapi/plugin_list.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
@@ skipping 693 matching lines @@
     ScopedVector<PluginGroup>* plugin_groups) {
   PluginGroup* group = NULL;
   for (size_t i = 0; i < plugin_groups->size(); ++i) {
     if ((*plugin_groups)[i]->Match(web_plugin_info)) {
       group = (*plugin_groups)[i];
       break;
     }
   }
   if (!group) {
     group = PluginGroup::FromWebPluginInfo(web_plugin_info);
-    // If group is scheduled for disabling do that now and remove it from the
-    // list.
-    if (groups_to_disable_.find(group->GetGroupName()) !=
-        groups_to_disable_.end()) {
-        group->EnableGroup(false);
-        groups_to_disable_.erase(group->GetGroupName());
-    }
     std::string identifier = group->identifier();
     // If the identifier is not unique, use the full path. This means that we
     // probably won't be able to search for this group by identifier, but at
     // least it's going to be in the set of plugin groups, and if there
     // is already a plug-in with the same filename, it's probably going to
     // handle the same MIME types (and it has a higher priority), so this one
     // is not going to run anyway.
     for (size_t i = 0; i < plugin_groups->size(); ++i) {
       if ((*plugin_groups)[i]->identifier() == identifier) {
         group->set_identifier(PluginGroup::GetLongIdentifier(web_plugin_info));
         break;
       }
     }
     plugin_groups->push_back(group);
   }
   group->AddPlugin(web_plugin_info);
+  // If group is scheduled for disabling do that now and remove it from the
+  // list.
+  if (groups_to_disable_.find(group->GetGroupName()) !=
+      groups_to_disable_.end()) {
+      group->EnableGroup(false);
+      groups_to_disable_.erase(group->GetGroupName());
+  }
   return group;
 }
 
 bool PluginList::EnablePlugin(const FilePath& filename) {
   base::AutoLock lock(lock_);
   for (size_t i = 0; i < plugin_groups_.size(); ++i) {
     if (plugin_groups_[i]->ContainsPlugin(filename))
       return plugin_groups_[i]->EnablePlugin(filename);
   }
   // Non existing plugin is being enabled. Check if it has been disabled before
@@ skipping 74 matching lines @@
 void PluginList::DisableOutdatedPluginGroups() {
   disable_outdated_plugins_ = true;
 }
 
 PluginList::~PluginList() {
 }
 
 
 }  // namespace npapi
 }  // namespace webkit