Merge r169938: Reland r167487: Get full WebPluginInfo for the PDF plug-in before enabling it for pr…

chrome/browser/printing/print_preview_tab_controller.cc

 // Copyright (c) 2012 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/printing/print_preview_tab_controller.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 18 matching lines @@
 #include "chrome/common/chrome_content_client.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
+#include "content/public/browser/plugin_service.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "ui/web_dialogs/constrained_web_dialog_ui.h"
 #include "ui/web_dialogs/web_dialog_delegate.h"
 #include "ui/web_dialogs/web_dialog_web_contents_delegate.h"
 #include "webkit/plugins/webplugininfo.h"
 
 using content::NativeWebKeyboardEvent;
 using content::NavigationController;
 using content::WebContents;
 using content::WebUIMessageHandler;
 using ui::ConstrainedWebDialogDelegate;
 using ui::WebDialogDelegate;
 using ui::WebDialogWebContentsDelegate;
 
 namespace {
 
 void EnableInternalPDFPluginForTab(TabContents* preview_tab) {
   // Always enable the internal PDF plugin for the print preview page.
+  FilePath pdf_plugin_path;
+  if (!PathService::Get(chrome::FILE_PDF_PLUGIN, &pdf_plugin_path))
+    return;
+
   webkit::WebPluginInfo pdf_plugin;
-  PathService::Get(chrome::FILE_PDF_PLUGIN, &pdf_plugin.path);
+  if (!content::PluginService::GetInstance()->GetPluginInfoByPath(
+      pdf_plugin_path, &pdf_plugin))
+    return;
 
   ChromePluginServiceFilter::GetInstance()->OverridePluginForTab(
-        preview_tab->web_contents()->GetRenderProcessHost()->GetID(),
-        preview_tab->web_contents()->GetRenderViewHost()->GetRoutingID(),
-        GURL(), pdf_plugin);
+      preview_tab->web_contents()->GetRenderProcessHost()->GetID(),
+      preview_tab->web_contents()->GetRenderViewHost()->GetRoutingID(),
+      GURL(), pdf_plugin);
 }
 
 // WebDialogDelegate that specifies what the print preview dialog
 // will look like.
 class PrintPreviewTabDelegate : public WebDialogDelegate {
  public:
   explicit PrintPreviewTabDelegate(TabContents* initiator_tab);
   virtual ~PrintPreviewTabDelegate();
 
   virtual ui::ModalType GetDialogModalType() const OVERRIDE;
@@ skipping 461 matching lines @@
   PrintPreviewUI* print_preview_ui = static_cast<PrintPreviewUI*>(
       preview_tab->web_contents()->GetWebUI()->GetController());
   if (print_preview_ui)
     print_preview_ui->OnTabDestroyed();
 
   preview_tab_map_.erase(preview_tab);
   RemoveObservers(preview_tab);
 }
 
 }  // namespace printing