Make WebPluginInfo more generic

chrome/browser/extensions/extension_service.cc

 // Copyright (c) 2011 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 "chrome/browser/extensions/extension_service.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/basictypes.h"
@@ skipping 2539 matching lines @@
   const PepperPluginInfo* pepper_info = NULL;
   std::vector<PepperPluginInfo> plugins;
   PepperPluginRegistry::ComputeList(&plugins);
 
   // Search the entire plugin list for plugins that handle the NaCl MIME type.
   // There can be multiple plugins like this, for instance the internal NaCl
   // plugin and a plugin registered by --register-pepper-plugins during tests.
   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) {
       if (mime_iter->mime_type == kNaClPluginMimeType) {
         // This plugin handles "application/x-nacl".
 
         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();
             iter != nacl_module_list_.end(); ++iter) {
           // 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(
               UTF8ToUTF16(iter->url.spec()));
           info.mime_types.push_back(mime_type_info);
         }
 
         webkit::npapi::PluginList::Singleton()->RefreshPlugins();
         webkit::npapi::PluginList::Singleton()->RegisterInternalPlugin(info);
         // This plugin has been modified, no need to check the rest of its
         // types, but continue checking other plugins.
         break;
       }
     }
   }
 }
 
 ExtensionService::NaClModuleInfoList::iterator
     ExtensionService::FindNaClModule(const GURL& url) {
   for (NaClModuleInfoList::iterator iter = nacl_module_list_.begin();
        iter != nacl_module_list_.end(); ++iter) {
     if (iter->url == url)
       return iter;
   }
   return nacl_module_list_.end();
 }