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::BrowserContext* browser_context = NULL;  // XXX

[Bernhard Bauer, 2011/08/03 14:47:33]

This is the only problem; I don't have a BrowserContext here, just a
ResourceContext.

[jam, 2011/08/03 16:20:43]

Why not use ResourceContext instead of BrowserContext for the filter? It seems
easier to get, since more threads have access to the RC than the BC (i.e. UI
thread has access to both, but most on IO thread and the message filters only
have RC)

[Bernhard Bauer, 2011/08/03 16:45:36]

Because a BrowserContext is a Profile, and we already have a mechanism for tying
objects to a Profile without the Profile having to know about it (see
http://crbug.com/77155). We don't have that for ResourceContext.

I guess I could update the map in the constructor/destructor for ProfileIOData
though...

   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(
+      info->child_id(), info->route_id(), browser_context,
+      request_->url(), GURL(), type, allow_wildcard,
+      &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);
 }