Use the PluginData object instead of the PluginInfoStore interface to test for

plugin supported mime types.

R=jam

Review URL: http://codereview.chromium.org/18141

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8219 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 5 deletions

diff --git a/webkit/glue/webframeloaderclient_impl.cc b/webkit/glue/webframeloaderclient_impl.cc
index a402c8f..7d45a6d 100644
--- a/webkit/glue/webframeloaderclient_impl.cc
+++ b/webkit/glue/webframeloaderclient_impl.cc
@@ -27,7 +27,7 @@ MSVC_PUSH_WARNING_LEVEL(0);
 #include "MouseEvent.h"
 #include "Page.h"
 #include "PlatformString.h"
-#include "PluginInfoStore.h"
+#include "PluginData.h"
 #include "RefPtr.h"
 #include "WindowFeatures.h"
 MSVC_POP_WARNING();
@@ -1176,7 +1176,7 @@ bool WebFrameLoaderClient::canShowMIMEType(const String& mime_type) const {
   // See if the type is handled by an installed plugin, if so, we can show it.
   // TODO(beng): (http://b/1085524) This is the place to stick a preference to
   //             disable full page plugins (optionally for certain types!)
-  return PluginInfoStore::supportsMIMEType(mime_type);
+  return webframe_->frame()->page()->pluginData()->supportsMimeType(mime_type);
 }
 
 bool WebFrameLoaderClient::representationExistsForURLScheme(const String& URLScheme) const {
@@ -1450,8 +1450,8 @@ Widget* WebFrameLoaderClient::createJavaAppletWidget(
 }
 
 ObjectContentType WebFrameLoaderClient::objectContentType(
-                                       const KURL& url,
-                                       const String& explicit_mime_type) {
+    const KURL& url,
+    const String& explicit_mime_type) {
   // This code is based on Apple's implementation from
   // WebCoreSupport/WebFrameBridge.mm.
 
@@ -1470,7 +1470,7 @@ ObjectContentType WebFrameLoaderClient::objectContentType(
   if (MIMETypeRegistry::isSupportedImageMIMEType(mime_type))
     return ObjectContentImage;
 
-  if (PluginInfoStore::supportsMIMEType(mime_type))
+  if (webframe_->frame()->page()->pluginData()->supportsMimeType(mime_type))
     return ObjectContentNetscapePlugin;
 
   if (MIMETypeRegistry::isSupportedNonImageMIMEType(mime_type))