PluginList cleanup

webkit/support/webkit_support.cc

Index: webkit/support/webkit_support.cc
diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc
index 87381b82be934f1a9cbc3b16d548a5a33a5f267d..139c4b4953934511ad79d4562e7c42637f3785a6 100644
--- a/webkit/support/webkit_support.cc
+++ b/webkit/support/webkit_support.cc
@@ -281,16 +281,16 @@ WebKit::WebKitClient* GetWebKitClient() {
 WebPlugin* CreateWebPlugin(WebFrame* frame,
                            const WebPluginParams& params) {
   const bool kAllowWildcard = true;
-  webkit::npapi::WebPluginInfo info;
-  std::string actual_mime_type;
-  if (!webkit::npapi::PluginList::Singleton()->GetPluginInfo(
-          params.url, params.mimeType.utf8(), kAllowWildcard, &info,
-          &actual_mime_type) || !webkit::npapi::IsPluginEnabled(info)) {
+  std::vector<webkit::npapi::WebPluginInfo> plugins;
+  std::vector<std::string> mime_types;
+  webkit::npapi::PluginList::Singleton()->GetPluginInfoArray(
+      params.url, params.mimeType.utf8(), kAllowWildcard,
+      NULL, &plugins, &mime_types);
+  if (plugins.empty())
     return NULL;
-  }
 
   return new WebPluginImplWithPageDelegate(
-      frame, params, info.path, actual_mime_type);
+      frame, params, plugins.front().path, mime_types.front());
 }
 
 WebKit::WebMediaPlayer* CreateMediaPlayer(WebFrame* frame,