Add PluginServiceFilter interface.

content/browser/renderer_host/buffered_resource_handler.cc

 // 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.
 
 #include "content/browser/renderer_host/buffered_resource_handler.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "chrome/browser/renderer_host/download_throttling_resource_handler.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/content_browser_client.h"
+#include "content/browser/plugin_service.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 #include "content/browser/renderer_host/resource_dispatcher_host_delegate.h"
 #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h"
 #include "content/browser/renderer_host/x509_user_cert_resource_handler.h"
 #include "content/common/resource_response.h"
 #include "net/base/io_buffer.h"
 #include "net/base/mime_sniffer.h"
 #include "net/base/mime_util.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_response_headers.h"
@@ skipping 356 matching lines @@
   if (host_->delegate() &&
       host_->delegate()->ShouldForceDownloadResource(request_->url(), type))
     return true;
 
   // MIME type checking.
   if (net::IsSupportedMimeType(type))
     return false;
 
   // Finally, check the plugin list.
   bool allow_wildcard = false;
+  ResourceDispatcherHostRequestInfo* info =
+      ResourceDispatcherHost::InfoForRequest(request_);
+  content::PluginFilter* filter =
+      content::GetContentClient()->browser()->CreatePluginFilter(
+          info->child_id(), info->route_id(), *info->context(),
+          request_->url(), GURL());
   bool stale = false;
-  std::vector<webkit::npapi::WebPluginInfo> plugins;
-  webkit::npapi::PluginList::Singleton()->GetPluginInfoArray(
-      request_->url(), type, allow_wildcard, &stale, &plugins, NULL);
+  webkit::npapi::WebPluginInfo plugin;
+  bool found = PluginService::GetInstance()->GetPluginInfo(
+      request_->url(), type, allow_wildcard, filter,
+      &stale, &plugin, NULL);
+
   if (need_plugin_list) {
     if (stale) {
       *need_plugin_list = true;
       return true;
     }
   } else {
     DCHECK(!stale);
   }
 
-  for (size_t i = 0; i < plugins.size(); ++i) {
-    if (webkit::npapi::IsPluginEnabled(plugins[i]))
-      return false;
-  }
-  return true;
+  return !found;
 }
 
 void BufferedResourceHandler::UseAlternateResourceHandler(
     int request_id,
     ResourceHandler* handler) {
   ResourceDispatcherHostRequestInfo* info =
       ResourceDispatcherHost::InfoForRequest(request_);
   if (bytes_read_) {
     // A Read has already occured and we need to copy the data into the new
     // ResourceHandler.
@@ skipping 33 matching lines @@
   wait_for_plugins_ = false;
   if (!request_)
     return;
 
   ResourceDispatcherHostRequestInfo* info =
       ResourceDispatcherHost::InfoForRequest(request_);
   host_->PauseRequest(info->child_id(), info->request_id(), false);
   if (!CompleteResponseStarted(info->request_id(), false))
     host_->CancelRequest(info->child_id(), info->request_id(), false);
 }