Revert 238283 "Infobar system refactor."

trunk/src/chrome/browser/ui/collected_cookies_infobar_delegate.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/ui/collected_cookies_infobar_delegate.h"
 
 #include "base/logging.h"
-#include "chrome/browser/infobars/infobar.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 
 // static
 void CollectedCookiesInfoBarDelegate::Create(InfoBarService* infobar_service) {
-  infobar_service->AddInfoBar(ConfirmInfoBarDelegate::CreateInfoBar(
-      scoped_ptr<ConfirmInfoBarDelegate>(
-          new CollectedCookiesInfoBarDelegate())));
+  infobar_service->AddInfoBar(scoped_ptr<InfoBarDelegate>(
+      new CollectedCookiesInfoBarDelegate(infobar_service)));
 }
 
-CollectedCookiesInfoBarDelegate::CollectedCookiesInfoBarDelegate()
-    : ConfirmInfoBarDelegate() {
+CollectedCookiesInfoBarDelegate::CollectedCookiesInfoBarDelegate(
+    InfoBarService* infobar_service)
+    : ConfirmInfoBarDelegate(infobar_service) {
 }
 
 CollectedCookiesInfoBarDelegate::~CollectedCookiesInfoBarDelegate() {
 }
 
 int CollectedCookiesInfoBarDelegate::GetIconID() const {
   return IDR_INFOBAR_COOKIE;
 }
 
 InfoBarDelegate::Type CollectedCookiesInfoBarDelegate::GetInfoBarType() const {
@@ skipping 11 matching lines @@
 string16 CollectedCookiesInfoBarDelegate::GetButtonLabel(
     InfoBarButton button) const {
   DCHECK_EQ(BUTTON_OK, button);
   return l10n_util::GetStringUTF16(IDS_COLLECTED_COOKIES_INFOBAR_BUTTON);
 }
 
 bool CollectedCookiesInfoBarDelegate::Accept() {
   web_contents()->GetController().Reload(true);
   return true;
 }