Revert 238283 "Infobar system refactor."

trunk/src/chrome/browser/plugins/plugin_infobar_delegates.h

Index: trunk/src/chrome/browser/plugins/plugin_infobar_delegates.h
===================================================================
--- trunk/src/chrome/browser/plugins/plugin_infobar_delegates.h	(revision 238401)
+++ trunk/src/chrome/browser/plugins/plugin_infobar_delegates.h	(working copy)
@@ -24,7 +24,8 @@
 // Base class for blocked plug-in infobars.
 class PluginInfoBarDelegate : public ConfirmInfoBarDelegate {
  protected:
-  explicit PluginInfoBarDelegate(const std::string& identifier);
+  PluginInfoBarDelegate(InfoBarService* infobar_service,
+                        const std::string& identifier);
   virtual ~PluginInfoBarDelegate();
 
   // ConfirmInfoBarDelegate:
@@ -47,7 +48,7 @@
 // Infobar that's shown when a plug-in requires user authorization to run.
 class UnauthorizedPluginInfoBarDelegate : public PluginInfoBarDelegate {
  public:
-  // Creates an unauthorized plugin infobar and delegate and adds the infobar to
+  // Creates an unauthorized plugin infobar delegate and adds it to
   // |infobar_service|.
   static void Create(InfoBarService* infobar_service,
                      HostContentSettingsMap* content_settings,
@@ -55,7 +56,8 @@
                      const std::string& identifier);
 
  private:
-  UnauthorizedPluginInfoBarDelegate(HostContentSettingsMap* content_settings,
+  UnauthorizedPluginInfoBarDelegate(InfoBarService* infobar_service,
+                                    HostContentSettingsMap* content_settings,
                                     const string16& name,
                                     const std::string& identifier);
   virtual ~UnauthorizedPluginInfoBarDelegate();
@@ -80,14 +82,15 @@
 class OutdatedPluginInfoBarDelegate : public PluginInfoBarDelegate,
                                       public WeakPluginInstallerObserver {
  public:
-  // Creates an outdated plugin infobar and delegate and adds the infobar to
+  // Creates an outdated plugin infobar delegate and adds it to
   // |infobar_service|.
   static void Create(InfoBarService* infobar_service,
                      PluginInstaller* installer,
                      scoped_ptr<PluginMetadata> metadata);
 
  private:
-  OutdatedPluginInfoBarDelegate(PluginInstaller* installer,
+  OutdatedPluginInfoBarDelegate(InfoBarService* infobar_service,
+                                PluginInstaller* installer,
                                 scoped_ptr<PluginMetadata> metadata,
                                 const string16& message);
   virtual ~OutdatedPluginInfoBarDelegate();
@@ -139,15 +142,16 @@
 
   // Replaces |infobar|, which must currently be owned, with an infobar asking
   // the user to install or update a particular plugin.
-  static void Replace(InfoBar* infobar,
+  static void Replace(InfoBarDelegate* infobar,
                       PluginInstaller* installer,
                       scoped_ptr<PluginMetadata> plugin_metadata,
                       bool new_install,
                       const string16& message);
 
  private:
-  PluginInstallerInfoBarDelegate(PluginInstaller* installer,
-                                 scoped_ptr<PluginMetadata> metadata,
+  PluginInstallerInfoBarDelegate(InfoBarService* infobar_service,
+                                 PluginInstaller* installer,
+                                 scoped_ptr<PluginMetadata> plugin_metadata,
                                  const InstallCallback& callback,
                                  bool new_install,
                                  const string16& message);
@@ -206,7 +210,9 @@
                      const string16& name);
 
  private:
-  PluginMetroModeInfoBarDelegate(Mode mode, const string16& name);
+  PluginMetroModeInfoBarDelegate(InfoBarService* infobar_service,
+                                 Mode mode,
+                                 const string16& name);
   virtual ~PluginMetroModeInfoBarDelegate();
 
   // ConfirmInfoBarDelegate: