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

webkit/plugins/npapi/plugin_list.cc

Index: webkit/plugins/npapi/plugin_list.cc
===================================================================
--- webkit/plugins/npapi/plugin_list.cc	(revision 170233)
+++ webkit/plugins/npapi/plugin_list.cc	(working copy)
@@ -698,21 +698,6 @@
   return false;
 }
 
-/*static*/
-bool PluginList::RemovePlugin(const FilePath& filename,
-                              std::vector<webkit::WebPluginInfo>* plugins) {
-  bool did_remove = false;
-  for (size_t i = 0; i < plugins->size();) {
-    if ((*plugins)[i].path == filename) {
-      plugins->erase(plugins->begin() + i);
-      did_remove = true;
-    } else {
-      i++;
-    }
-  }
-  return did_remove;
-}
-
 PluginList::~PluginList() {
 }