revert 128949 (and dependent 129252)

chrome/browser/plugin_observer.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/plugin_observer.h"
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/stl_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 100 matching lines @@
 
 #if defined(ENABLE_PLUGIN_INSTALLATION)
 class PluginObserver::PluginPlaceholderHost : public PluginInstallerObserver {
  public:
   PluginPlaceholderHost(PluginObserver* observer,
                         int routing_id,
                         PluginInstaller* installer)
       : PluginInstallerObserver(installer),
         observer_(observer),
         routing_id_(routing_id) {
-    DCHECK(installer);
     switch (installer->state()) {
       case PluginInstaller::kStateIdle: {
         observer->Send(new ChromeViewMsg_FoundMissingPlugin(routing_id_,
                                                             installer->name()));
         break;
       }
       case PluginInstaller::kStateDownloading: {
         DownloadStarted();
         break;
       }
@@ skipping 63 matching lines @@
   infobar_helper->AddInfoBar(
       new UnauthorizedPluginInfoBarDelegate(
           infobar_helper,
           tab_contents_->profile()->GetHostContentSettingsMap(),
           name));
 }
 
 void PluginObserver::OnBlockedOutdatedPlugin(int placeholder_id,
                                              const std::string& identifier) {
 #if defined(ENABLE_PLUGIN_INSTALLATION)
-  PluginFinder::Get(base::Bind(&PluginObserver::FindPluginToUpdate,
-                               weak_ptr_factory_.GetWeakPtr(),
-                               placeholder_id, identifier));
+  PluginFinder* plugin_finder = PluginFinder::GetInstance();
+  plugin_finder->FindPluginWithIdentifier(
+      identifier,
+      base::Bind(&PluginObserver::FoundPluginToUpdate,
+                 weak_ptr_factory_.GetWeakPtr(), placeholder_id));
 #else
   // If we don't support third-party plug-in installation, we shouldn't have
   // outdated plug-ins.
   NOTREACHED();
 #endif  // defined(ENABLE_PLUGIN_INSTALLATION)
 }
 
 #if defined(ENABLE_PLUGIN_INSTALLATION)
-void PluginObserver::FindPluginToUpdate(int placeholder_id,
-                                        const std::string& identifier,
-                                        PluginFinder* plugin_finder) {
-  PluginInstaller* installer =
-      plugin_finder->FindPluginWithIdentifier(identifier);
+void PluginObserver::FoundPluginToUpdate(int placeholder_id,
+                                         PluginInstaller* installer) {
   plugin_placeholders_[placeholder_id] =
       new PluginPlaceholderHost(this, placeholder_id, installer);
   InfoBarTabHelper* infobar_helper = tab_contents_->infobar_tab_helper();
   infobar_helper->AddInfoBar(
       OutdatedPluginInfoBarDelegate::Create(this, installer));
 }
 
 void PluginObserver::OnFindMissingPlugin(int placeholder_id,
                                          const std::string& mime_type) {
-PluginFinder::Get(base::Bind(&PluginObserver::FindMissingPlugin,
-                             weak_ptr_factory_.GetWeakPtr(),
-                             placeholder_id, mime_type));
+  PluginFinder* plugin_finder = PluginFinder::GetInstance();
+  std::string lang = "en-US";  // Oh yes.
+  plugin_finder->FindPlugin(
+      mime_type, lang,
+      base::Bind(&PluginObserver::FoundMissingPlugin,
+                 weak_ptr_factory_.GetWeakPtr(), placeholder_id, mime_type));
 }
 
-void PluginObserver::FindMissingPlugin(int placeholder_id,
-                                       const std::string& mime_type,
-                                       PluginFinder* plugin_finder) {
-  std::string lang = "en-US";  // Oh yes.
-  PluginInstaller* installer = plugin_finder->FindPlugin(mime_type, lang);
+void PluginObserver::FoundMissingPlugin(int placeholder_id,
+                                        const std::string& mime_type,
+                                        PluginInstaller* installer) {
   if (!installer) {
     Send(new ChromeViewMsg_DidNotFindMissingPlugin(placeholder_id));
     return;
   }
 
   plugin_placeholders_[placeholder_id] =
       new PluginPlaceholderHost(this, placeholder_id, installer);
   InfoBarTabHelper* infobar_helper = tab_contents_->infobar_tab_helper();
   InfoBarDelegate* delegate = PluginInstallerInfoBarDelegate::Create(
       infobar_helper, installer,
@@ skipping 24 matching lines @@
 }
 #endif  // defined(ENABLE_PLUGIN_INSTALLATION)
 
 void PluginObserver::OnOpenAboutPlugins() {
     web_contents()->OpenURL(OpenURLParams(
         GURL(chrome::kAboutPluginsURL),
         content::Referrer(web_contents()->GetURL(),
                           WebKit::WebReferrerPolicyDefault),
         NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_TYPED, false));
 }