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

webkit/plugins/npapi/plugin_list.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 <algorithm>
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
@@ skipping 434 matching lines @@
       if (mime_type.file_extensions[j] == extension) {
         if (actual_mime_type)
           *actual_mime_type = mime_type.mime_type;
         return true;
       }
     }
   }
   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() {
 }
 
 
 }  // namespace npapi
 }  // namespace webkit