Merge 167979 - Remove PluginList::RemovePlugin() and directly remove old plug-ins from plug-in list…

webkit/plugins/npapi/plugin_list_win.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 "webkit/plugins/npapi/plugin_list.h"
 
 #include <tchar.h>
 
 #include <set>
 
@@ skipping 440 matching lines @@
   for (size_t j = 0; j < plugins->size(); ++j) {
     FilePath::StringType plugin1 =
         StringToLowerASCII((*plugins)[j].path.BaseName().value());
     FilePath::StringType plugin2 =
         StringToLowerASCII(info.path.BaseName().value());
     if ((plugin1 == plugin2 && HaveSharedMimeType((*plugins)[j], info)) ||
         (plugin1 == kJavaDeploy1 && plugin2 == kJavaDeploy2) ||
         (plugin1 == kJavaDeploy2 && plugin2 == kJavaDeploy1)) {
       if (!IsNewerVersion((*plugins)[j].version, info.version))
         return false;  // We have loaded a plugin whose version is newer.
-      PluginList::RemovePlugin((*plugins)[j].path, plugins);
+      plugins->erase(plugins->begin() + j);
       break;
     }
   }
 
   // Troublemakers
 
   FilePath::StringType filename =
       StringToLowerASCII(info.path.BaseName().value());
   // Depends on XPCOM.
   if (filename == kMozillaActiveXPlugin)
@@ skipping 35 matching lines @@
 
   // Special WMP handling
 
   // If both the new and old WMP plugins exist, only load the new one.
   if (filename == kNewWMPPlugin) {
     if (dont_load_new_wmp_)
       return false;
 
     for (size_t j = 0; j < plugins->size(); ++j) {
       if ((*plugins)[j].path.BaseName().value() == kOldWMPPlugin) {
-        PluginList::RemovePlugin((*plugins)[j].path, plugins);
+        plugins->erase(plugins->begin() + j);
         break;
       }
     }
 
   } else if (filename == kOldWMPPlugin) {
     for (size_t j = 0; j < plugins->size(); ++j) {
       if ((*plugins)[j].path.BaseName().value() == kNewWMPPlugin)
         return false;
     }
   }
 
   HMODULE plugin_dll = NULL;
   bool load_plugin = true;
 
   // The plugin list could contain a 64 bit plugin which we cannot load.
   for (size_t i = 0; i < internal_plugins_.size(); ++i) {
     if (info.path == internal_plugins_[i].info.path)
       continue;
 
     if (file_util::PathExists(info.path) && (!IsValid32BitImage(info.path)))
       load_plugin = false;
     break;
   }
   return load_plugin;
 }
 
 
 }  // namespace npapi
 }  // namespace webkit