Finish moving plugin probing out of process.

chrome/browser/ui/browser.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 "chrome/browser/ui/browser.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // OS_WIN
@@ skipping 117 matching lines @@
 #include "chrome/common/profiling.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/common/web_apps.h"
 #include "content/browser/browser_url_handler.h"
 #include "content/browser/child_process_security_policy.h"
 #include "content/browser/debugger/devtools_manager.h"
 #include "content/browser/download/download_item.h"
 #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"
 #include "content/browser/tab_contents/navigation_controller.h"
 #include "content/browser/tab_contents/navigation_entry.h"
 #include "content/browser/tab_contents/tab_contents_view.h"
 #include "content/browser/user_metrics.h"
 #include "content/common/content_restriction.h"
 #include "content/common/content_switches.h"
 #include "content/common/notification_service.h"
@@ skipping 32 matching lines @@
 #include "chrome/browser/chromeos/boot_times_loader.h"
 #include "chrome/browser/ui/webui/active_downloads_ui.h"
 #else
 #include "chrome/browser/download/download_shelf.h"
 #endif
 
 #if defined(FILE_MANAGER_EXTENSION)
 #include "chrome/browser/extensions/file_manager_util.h"
 #endif
 
-#include "webkit/plugins/npapi/plugin_list.h"
-
 using base::TimeDelta;
 
 ///////////////////////////////////////////////////////////////////////////////
 
 namespace {
 
 // The URL to be loaded to display Help.
 const char kHelpContentUrl[] =
 #if defined(OS_CHROMEOS)
   #if defined(OFFICIAL_BUILD)
@@ skipping 2307 matching lines @@
                                   const FilePath& plugin_path) {
   TabContentsWrapper* tcw = TabContentsWrapper::GetCurrentWrapperForContents(
       tab);
   if (!tcw)
     return;
 
   DCHECK(!plugin_path.value().empty());
 
   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
     // terrible, so look for that and strip it off if present.
     const std::string kPluginExtension = ".plugin";
     if (EndsWith(plugin_name, ASCIIToUTF16(kPluginExtension), true))
       plugin_name.erase(plugin_name.length() - kPluginExtension.length());
 #endif  // OS_MACOSX
   }
   gfx::Image* icon = &ResourceBundle::GetSharedInstance().GetNativeImageNamed(
@@ skipping 2750 matching lines @@
     window_->GetLocationBar()->ShowFirstRunBubble(bubble_type);
   } else if (is_type_tabbed()) {
     GlobalErrorService* service =
         GlobalErrorServiceFactory::GetForProfile(profile());
     GlobalError* error = service->GetFirstGlobalErrorWithBubbleView();
     if (error) {
       error->ShowBubbleView(this);
     }
   }
 }