Finish moving plugin probing out of process.

chrome/browser/chromeos/gview_request_interceptor.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/chromeos/gview_request_interceptor.h"
 
 #include "base/file_path.h"
 #include "base/path_service.h"
 #include "chrome/browser/chrome_plugin_service_filter.h"
 #include "chrome/common/chrome_paths.h"
+#include "content/browser/plugin_service.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/escape.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_redirect_job.h"
-#include "webkit/plugins/npapi/plugin_list.h"
+#include "webkit/plugins/webplugininfo.h"
 
 namespace chromeos {
 
 // The PDF mime type is treated special if the browser has a built-in
 // PDF viewer plug-in installed - we want to intercept only if we're
 // told to.
 static const char kPdfMimeType[] = "application/pdf";
 
 // This is the list of mime types currently supported by the Google
 // Document Viewer.
@@ skipping 29 matching lines @@
 bool GViewRequestInterceptor::ShouldUsePdfPlugin(
     net::URLRequest* request) const {
   FilePath pdf_path;
   PathService::Get(chrome::FILE_PDF_PLUGIN, &pdf_path);
   ResourceDispatcherHostRequestInfo* info =
       ResourceDispatcherHost::InfoForRequest(request);
   if (!info)
     return false;
 
   webkit::WebPluginInfo plugin;
-  if (!webkit::npapi::PluginList::Singleton()->GetPluginInfoByPath(
-      pdf_path, &plugin)) {
+  if (!PluginService::GetInstance()->GetPluginInfoByPath(pdf_path, &plugin)) {
     return false;
   }
 
   return ChromePluginServiceFilter::GetInstance()->ShouldUsePlugin(
       info->child_id(), info->route_id(), info->context(),
       request->url(), GURL(), &plugin);
 }
 
 net::URLRequestJob* GViewRequestInterceptor::MaybeInterceptResponse(
     net::URLRequest* request) const {
@@ skipping 13 matching lines @@
   // will redirect the browser to this new URL.
   if (supported_mime_types_.count(mime_type) > 0) {
     std::string url(kGViewUrlPrefix);
     url += EscapePath(request->url().spec());
     return new net::URLRequestRedirectJob(request, GURL(url));
   }
   return NULL;
 }
 
 }  // namespace chromeos