Finish moving plugin probing out of process.

chrome/browser/plugin_data_remover.cc

Index: chrome/browser/plugin_data_remover.cc
diff --git a/chrome/browser/plugin_data_remover.cc b/chrome/browser/plugin_data_remover.cc
index 89de394abbc31c2d0087c98351772211bf5fb377..7bf186d50cc93c7cd5911aed498a243a8a67ab8e 100644
--- a/chrome/browser/plugin_data_remover.cc
+++ b/chrome/browser/plugin_data_remover.cc
@@ -17,7 +17,6 @@
 #include "content/browser/plugin_service.h"
 #include "content/common/plugin_messages.h"
 #include "webkit/plugins/npapi/plugin_group.h"
-#include "webkit/plugins/npapi/plugin_list.h"
 
 #if defined(OS_POSIX)
 #include "ipc/ipc_channel_posix.h"
@@ -181,11 +180,10 @@ void PluginDataRemover::SignalDone() {
 
 // static
 bool PluginDataRemover::IsSupported(PluginPrefs* plugin_prefs) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   bool allow_wildcard = false;
   std::vector<webkit::WebPluginInfo> plugins;
-  webkit::npapi::PluginList::Singleton()->GetPluginInfoArray(
-      GURL(), kFlashMimeType, allow_wildcard, NULL, &plugins, NULL);
+  PluginService::GetInstance()->GetPluginInfoArray(
+      GURL(), kFlashMimeType, allow_wildcard, &plugins, NULL);
   std::vector<webkit::WebPluginInfo>::iterator plugin = plugins.begin();
   if (plugin == plugins.end())
     return false;