Revert 238283 "Infobar system refactor."

trunk/src/chrome/browser/infobars/insecure_content_infobar_delegate.h

 // 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.
 
 #ifndef CHROME_BROWSER_INFOBARS_INSECURE_CONTENT_INFOBAR_DELEGATE_H_
 #define CHROME_BROWSER_INFOBARS_INSECURE_CONTENT_INFOBAR_DELEGATE_H_
 
 #include "chrome/browser/infobars/confirm_infobar_delegate.h"
 
 // Base class for delegates that show warnings on HTTPS pages which try to
 // display or run insecure content.
 class InsecureContentInfoBarDelegate : public ConfirmInfoBarDelegate {
  public:
   enum InfoBarType {
     DISPLAY,  // Shown when "inactive" content (e.g. images) has been blocked.
     RUN,      // Shown when "active" content (e.g. script) has been blocked.
   };
 
   // Depending on the |type| requested and whether an insecure content infobar
   // is already present in |infobar_service|, may do nothing; otherwise, creates
-  // an insecure content infobar and delegate and either adds the infobar to
+  // an insecure content infobar delegate and either adds it to
   // |infobar_service| or replaces the existing infobar.
   static void Create(InfoBarService* infobar_service, InfoBarType type);
 
  private:
   enum HistogramEvents {
     DISPLAY_INFOBAR_SHOWN = 0,  // Infobar was displayed.
     DISPLAY_USER_OVERRIDE,      // User clicked allow anyway button.
     DISPLAY_USER_DID_NOT_LOAD,  // User clicked the don't load button.
     DISPLAY_INFOBAR_DISMISSED,  // User clicked close button.
     RUN_INFOBAR_SHOWN,
     RUN_USER_OVERRIDE,
     RUN_USER_DID_NOT_LOAD,
     RUN_INFOBAR_DISMISSED,
     NUM_EVENTS
   };
 
-  explicit InsecureContentInfoBarDelegate(InfoBarType type);
+  InsecureContentInfoBarDelegate(InfoBarService* infobar_service,
+                                 InfoBarType type);
   virtual ~InsecureContentInfoBarDelegate();
 
   // ConfirmInfoBarDelegate:
   virtual void InfoBarDismissed() OVERRIDE;
   virtual InsecureContentInfoBarDelegate*
       AsInsecureContentInfoBarDelegate() OVERRIDE;
   virtual string16 GetMessageText() const OVERRIDE;
   virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
   virtual bool Accept() OVERRIDE;
   virtual bool Cancel() OVERRIDE;
   virtual string16 GetLinkText() const OVERRIDE;
   virtual bool LinkClicked(WindowOpenDisposition disposition) OVERRIDE;
 
   InfoBarType type_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(InsecureContentInfoBarDelegate);
 };
 
 #endif  // CHROME_BROWSER_INFOBARS_INSECURE_CONTENT_INFOBAR_DELEGATE_H_