PluginList cleanup

chrome/browser/ui/cocoa/drag_util.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/drag_util.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/sys_string_conversions.h"
 #include "content/common/url_constants.h"
@@ skipping 61 matching lines @@
   std::string mime_type;
   net::GetMimeTypeFromFile(full_path, &mime_type);
 
   // This logic mirrors |BufferedResourceHandler::ShouldDownload()|.
   // TODO(asvitkine): Refactor this out to a common location instead of
   //                  duplicating code.
   if (net::IsSupportedMimeType(mime_type))
     return YES;
 
   // Check whether there is a plugin that supports the mime type. (e.g. PDF)
-  webkit::npapi::PluginList* list = webkit::npapi::PluginList::Singleton();
-  webkit::npapi::WebPluginInfo info;
-  if (!list->stale() &&
-      list->GetPluginInfo(GURL(), mime_type, false, &info, NULL)) {
-    return webkit::npapi::IsPluginEnabled(info);
+  // TODO(bauerb): This possibly uses stale information, but it's guaranteed not
+  // to do disk access.
+  bool stale = false;
+  std::vector<webkit::npapi::WebPluginInfo> info_array;
+  webkit::npapi::PluginList::Singleton()->GetPluginInfoArray(
+      url, mime_type, false, &stale, &info_array, NULL);
+  for (size_t i = 0; i < info_array.size(); ++i) {
+    if (webkit::npapi::IsPluginEnabled(info_array[i]))
+      return true;
   }
 
   return NO;
 }
 
 BOOL IsUnsupportedDropData(id<NSDraggingInfo> info) {
   GURL url = GetFileURLFromDropData(info);
   if (!url.is_empty()) {
     // If dragging a file, only allow dropping supported file types (that the
     // web view can display).
     return !IsSupportedFileURL(url);
   }
   return NO;
 }
 
 }  // namespace drag_util