Finish moving plugin probing out of process.

chrome/browser/ui/browser.cc

Index: chrome/browser/ui/browser.cc
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index ae847aa46442ba29bac77e50d6b386d762522fc9..703edf74a916c3485e7b4ff0fe8bcd2b02d775dd 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -135,6 +135,7 @@
 #include "content/browser/download/download_manager.h"
 #include "content/browser/download/save_package.h"
 #include "content/browser/host_zoom_map.h"
+#include "content/browser/plugin_service.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/site_instance.h"
 #include "content/browser/tab_contents/interstitial_page.h"
@@ -187,8 +188,6 @@
 #include "chrome/browser/extensions/file_manager_util.h"
 #endif
 
-#include "webkit/plugins/npapi/plugin_list.h"
-
 using base::TimeDelta;
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -2516,9 +2515,9 @@ void Browser::CrashedPluginHelper(TabContents* tab,
 
   string16 plugin_name = plugin_path.LossyDisplayName();
   webkit::WebPluginInfo plugin_info;
-  if (webkit::npapi::PluginList::Singleton()->GetPluginInfoByPath(
-          plugin_path, &plugin_info) &&
-      !plugin_info.name.empty()) {
+  CHECK(PluginService::GetInstance()->GetPluginInfoByPath(plugin_path,
+                                                          &plugin_info));
+  if (!plugin_info.name.empty()) {
     plugin_name = plugin_info.name;
 #if defined(OS_MACOSX)
     // Many plugins on the Mac have .plugin in the actual name, which looks