Make WebPluginInfo more generic

content/common/pepper_plugin_registry.h

 // 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.
 
 #ifndef CONTENT_COMMON_PEPPER_PLUGIN_REGISTRY_H_
 #define CONTENT_COMMON_PEPPER_PLUGIN_REGISTRY_H_
 #pragma once
 
 #include <list>
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/file_path.h"
 #include "ppapi/proxy/proxy_channel.h"
-#include "webkit/plugins/npapi/webplugininfo.h"
 #include "webkit/plugins/ppapi/plugin_delegate.h"
 #include "webkit/plugins/ppapi/plugin_module.h"
+#include "webkit/plugins/webplugininfo.h"
 
 struct PepperPluginInfo {
   PepperPluginInfo();
   ~PepperPluginInfo();
 
-  webkit::npapi::WebPluginInfo ToWebPluginInfo() const;
+  webkit::WebPluginInfo ToWebPluginInfo() const;
 
   // Indicates internal plugins for which there's not actually a library.
   // These plugins are implemented in the Chrome binary using a separate set
   // of entry points (see internal_entry_points below).
   // Defaults to false.
   bool is_internal;
 
   // True when this plugin should be run out of process. Defaults to false.
   bool is_out_of_process;
 
   // Whether the plugin is enabled.  Defaults to true.
   bool enabled;
 
   FilePath path;  // Internal plugins have "internal-[name]" as path.
   std::string name;
   std::string description;
   std::string version;
-  std::vector<webkit::npapi::WebPluginMimeType> mime_types;
+  std::vector<webkit::WebPluginMimeType> mime_types;
 
   // When is_internal is set, this contains the function pointers to the
   // entry points for the internal plugins.
   webkit::ppapi::PluginModule::EntryPoints internal_entry_points;
 };
 
 // This class holds references to all of the known pepper plugin modules.
 //
 // It keeps two lists. One list of preloaded in-process modules, and one list
 // is a list of all live modules (some of which may be out-of-process and hence
@@ skipping 62 matching lines @@
   // non-crashed modules. If an out-of-process module crashes, it may
   // continue as long as there are WebKit references to it, but it will not
   // appear in this list.
   typedef std::map<FilePath, webkit::ppapi::PluginModule*> NonOwningModuleMap;
   NonOwningModuleMap live_modules_;
 
   DISALLOW_COPY_AND_ASSIGN(PepperPluginRegistry);
 };
 
 #endif  // CONTENT_COMMON_PEPPER_PLUGIN_REGISTRY_H_