Make WebPluginInfo more generic

chrome/browser/plugin_data_remover.cc

Index: chrome/browser/plugin_data_remover.cc
===================================================================
--- chrome/browser/plugin_data_remover.cc	(revision 96613)
+++ chrome/browser/plugin_data_remover.cc	(working copy)
@@ -87,7 +87,7 @@
 }
 
 void PluginDataRemover::SetPluginInfo(
-    const webkit::npapi::WebPluginInfo& info) {
+    const webkit::WebPluginInfo& info) {
 }
 
 void PluginDataRemover::OnChannelOpened(const IPC::ChannelHandle& handle) {
@@ -168,10 +168,10 @@
 bool PluginDataRemover::IsSupported() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   bool allow_wildcard = false;
-  std::vector<webkit::npapi::WebPluginInfo> plugins;
+  std::vector<webkit::WebPluginInfo> plugins;
   webkit::npapi::PluginList::Singleton()->GetPluginInfoArray(
       GURL(), kFlashMimeType, allow_wildcard, NULL, &plugins, NULL);
-  std::vector<webkit::npapi::WebPluginInfo>::iterator plugin = plugins.begin();
+  std::vector<webkit::WebPluginInfo>::iterator plugin = plugins.begin();
   if (plugin == plugins.end())
     return false;
   scoped_ptr<Version> version(
@@ -181,7 +181,7 @@
           switches::kMinClearSiteDataFlashVersion)));
   if (!min_version.get())
     min_version.reset(Version::GetVersionFromString(kMinFlashVersion));
-  return webkit::npapi::IsPluginEnabled(*plugin) &&
+  return webkit::IsPluginEnabled(*plugin) &&
          version.get() &&
          min_version->CompareTo(*version) == -1;
 }