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 67a532374ce145d6e0b6df88a879d50592e204e3..f6184900e2ca2474bf75c3a2313fdaf19a3c8d22 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;
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -2540,7 +2539,7 @@ void Browser::CrashedPluginHelper(TabContents* tab,
 
   string16 plugin_name = plugin_path.LossyDisplayName();
   webkit::WebPluginInfo plugin_info;
-  if (webkit::npapi::PluginList::Singleton()->GetPluginInfoByPath(
+  if (PluginService::GetInstance()->GetPluginInfoByPath(
           plugin_path, &plugin_info) &&
       !plugin_info.name.empty()) {
     plugin_name = plugin_info.name;