Make WebPluginInfo more generic

chrome/browser/extensions/extension_service.cc

Index: chrome/browser/extensions/extension_service.cc
===================================================================
--- chrome/browser/extensions/extension_service.cc	(revision 96613)
+++ chrome/browser/extensions/extension_service.cc	(working copy)
@@ -2557,7 +2557,7 @@
   for (size_t i = 0; i < plugins.size(); ++i) {
     pepper_info = &plugins[i];
     CHECK(pepper_info);
-    std::vector<webkit::npapi::WebPluginMimeType>::const_iterator mime_iter;
+    std::vector<webkit::WebPluginMimeType>::const_iterator mime_iter;
     // Check each MIME type the plugins handle for the NaCl MIME type.
     for (mime_iter = pepper_info->mime_types.begin();
          mime_iter != pepper_info->mime_types.end(); ++mime_iter) {
@@ -2567,7 +2567,7 @@
         webkit::npapi::PluginList::Singleton()->
             UnregisterInternalPlugin(pepper_info->path);
 
-        webkit::npapi::WebPluginInfo info = pepper_info->ToWebPluginInfo();
+        webkit::WebPluginInfo info = pepper_info->ToWebPluginInfo();
 
         for (ExtensionService::NaClModuleInfoList::const_iterator iter =
             nacl_module_list_.begin();
@@ -2575,7 +2575,7 @@
           // Add the MIME type specified in the extension to this NaCl plugin,
           // With an extra "nacl" argument to specify the location of the NaCl
           // manifest file.
-          webkit::npapi::WebPluginMimeType mime_type_info;
+          webkit::WebPluginMimeType mime_type_info;
           mime_type_info.mime_type = iter->mime_type;
           mime_type_info.additional_param_names.push_back(UTF8ToUTF16("nacl"));
           mime_type_info.additional_param_values.push_back(