Make WebPluginInfo more generic

chrome/browser/ui/webui/flash_ui.cc

Index: chrome/browser/ui/webui/flash_ui.cc
===================================================================
--- chrome/browser/ui/webui/flash_ui.cc	(revision 96613)
+++ chrome/browser/ui/webui/flash_ui.cc	(working copy)
@@ -27,7 +27,7 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "webkit/plugins/npapi/plugin_list.h"
-#include "webkit/plugins/npapi/webplugininfo.h"
+#include "webkit/plugins/webplugininfo.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
@@ -221,7 +221,7 @@
   AddPair(list, l10n_util::GetStringUTF16(IDS_ABOUT_VERSION_OS), os_label);
 
   // Obtain the version of the Flash plugins.
-  std::vector<webkit::npapi::WebPluginInfo> info_array;
+  std::vector<webkit::WebPluginInfo> info_array;
   webkit::npapi::PluginList::Singleton()->GetPluginInfoArray(
       GURL(), "application/x-shockwave-flash", false, NULL, &info_array, NULL);
   string16 flash_version;
@@ -229,7 +229,7 @@
     AddPair(list, ASCIIToUTF16("Flash plugin"), "Disabled");
   } else {
     for (size_t i = 0; i < info_array.size(); ++i) {
-      if (webkit::npapi::IsPluginEnabled(info_array[i])) {
+      if (webkit::IsPluginEnabled(info_array[i])) {
         flash_version = info_array[i].version + ASCIIToUTF16(" ") +
                         info_array[i].path.LossyDisplayName();
         if (i != 0)