Revert 238283 "Infobar system refactor."

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

Index: trunk/src/chrome/browser/ui/startup/session_crashed_infobar_delegate_unittest.cc
===================================================================
--- trunk/src/chrome/browser/ui/startup/session_crashed_infobar_delegate_unittest.cc	(revision 238401)
+++ trunk/src/chrome/browser/ui/startup/session_crashed_infobar_delegate_unittest.cc	(working copy)
@@ -7,7 +7,6 @@
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/testing_pref_service.h"
 #include "base/run_loop.h"
-#include "chrome/browser/infobars/infobar.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/sessions/session_service_factory.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
@@ -62,8 +61,8 @@
   InfoBarService* infobar_service =
       InfoBarService::FromWebContents(web_contents);
   EXPECT_EQ(1U, infobar_service->infobar_count());
-  ConfirmInfoBarDelegate* infobar =
-      infobar_service->infobar_at(0)->delegate()->AsConfirmInfoBarDelegate();
+  scoped_ptr<ConfirmInfoBarDelegate> infobar(InfoBarService::FromWebContents(
+      web_contents)->infobar_at(0)->AsConfirmInfoBarDelegate());
   ASSERT_TRUE(infobar);
 
   // Open another browser.