Revert 238283 "Infobar system refactor."

trunk/src/chrome/browser/ui/startup/obsolete_os_infobar_delegate.cc

Index: trunk/src/chrome/browser/ui/startup/obsolete_os_infobar_delegate.cc
===================================================================
--- trunk/src/chrome/browser/ui/startup/obsolete_os_infobar_delegate.cc	(revision 238401)
+++ trunk/src/chrome/browser/ui/startup/obsolete_os_infobar_delegate.cc	(working copy)
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/ui/startup/obsolete_os_infobar_delegate.h"
 
-#include "chrome/browser/infobars/infobar.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/chromium_strings.h"
@@ -36,12 +35,13 @@
   return;
 #endif
 
-  infobar_service->AddInfoBar(ConfirmInfoBarDelegate::CreateInfoBar(
-      scoped_ptr<ConfirmInfoBarDelegate>(new ObsoleteOSInfoBarDelegate())));
+  infobar_service->AddInfoBar(scoped_ptr<InfoBarDelegate>(
+      new ObsoleteOSInfoBarDelegate(infobar_service)));
 }
 
-ObsoleteOSInfoBarDelegate::ObsoleteOSInfoBarDelegate()
-    : ConfirmInfoBarDelegate() {
+ObsoleteOSInfoBarDelegate::ObsoleteOSInfoBarDelegate(
+    InfoBarService* infobar_service)
+    : ConfirmInfoBarDelegate(infobar_service) {
 }
 
 ObsoleteOSInfoBarDelegate::~ObsoleteOSInfoBarDelegate() {