Revert 238283 "Infobar system refactor."

trunk/src/chrome/browser/translate/translate_manager_browsertest.cc

Index: trunk/src/chrome/browser/translate/translate_manager_browsertest.cc
===================================================================
--- trunk/src/chrome/browser/translate/translate_manager_browsertest.cc	(revision 238401)
+++ trunk/src/chrome/browser/translate/translate_manager_browsertest.cc	(working copy)
@@ -153,8 +153,7 @@
   // infobar.
   TranslateInfoBarDelegate* GetTranslateInfoBar() {
     return (infobar_service()->infobar_count() == 1) ?
-        infobar_service()->infobar_at(0)->delegate()->
-            AsTranslateInfoBarDelegate() : NULL;
+        infobar_service()->infobar_at(0)->AsTranslateInfoBarDelegate() : NULL;
   }
 
   // If there is 1 infobar and it is a translate infobar, closes it and returns
@@ -164,7 +163,7 @@
     if (!infobar)
       return false;
     infobar->InfoBarDismissed();  // Simulates closing the infobar.
-    infobar_service()->RemoveInfoBar(infobar_service()->infobar_at(0));
+    infobar_service()->RemoveInfoBar(infobar);
     return true;
   }
 
@@ -187,7 +186,7 @@
     if (!infobar)
       return false;
     infobar->TranslationDeclined();
-    infobar_service()->RemoveInfoBar(infobar_service()->infobar_at(0));
+    infobar_service()->RemoveInfoBar(infobar);
     return true;
   }
 
@@ -214,7 +213,7 @@
                        const content::NotificationDetails& details) {
     DCHECK_EQ(chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED, type);
     removed_infobars_.insert(
-        content::Details<InfoBar::RemovedDetails>(details)->first->delegate());
+        content::Details<InfoBar::RemovedDetails>(details)->first);
   }
 
   MOCK_METHOD1(OnPreferenceChanged, void(const std::string&));