Create an API around PluginService and use it from Chrome.

chrome/browser/renderer_host/plugin_info_message_filter.cc

Index: chrome/browser/renderer_host/plugin_info_message_filter.cc
===================================================================
--- chrome/browser/renderer_host/plugin_info_message_filter.cc	(revision 115169)
+++ chrome/browser/renderer_host/plugin_info_message_filter.cc	(working copy)
@@ -14,9 +14,9 @@
 #include "chrome/common/chrome_content_client.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
-#include "content/browser/plugin_service.h"
 #include "content/browser/plugin_service_filter.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/plugin_service.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/plugins/npapi/plugin_group.h"
 #include "webkit/plugins/npapi/plugin_list.h"
@@ -27,6 +27,8 @@
 #include "chrome/installer/util/google_update_settings.h"
 #endif
 
+using content::PluginService;
+
 namespace {
 
 // Override the behavior of the security infobars for plugins. Only
@@ -217,7 +219,8 @@
     matching_plugins.pop_back();
   }
 
-  content::PluginServiceFilter* filter = PluginService::GetInstance()->filter();
+  content::PluginServiceFilter* filter =
+      PluginService::GetInstance()->GetFilter();
   bool allowed = false;
   for (size_t i = 0; i < matching_plugins.size(); ++i) {
     if (!filter || filter->ShouldUsePlugin(render_process_id_,