Revert 238283 "Infobar system refactor."

trunk/src/chrome/browser/ui/cocoa/infobars/infobar_controller.mm

Index: trunk/src/chrome/browser/ui/cocoa/infobars/infobar_controller.mm
===================================================================
--- trunk/src/chrome/browser/ui/cocoa/infobars/infobar_controller.mm	(revision 238401)
+++ trunk/src/chrome/browser/ui/cocoa/infobars/infobar_controller.mm	(working copy)
@@ -116,16 +116,13 @@
 }
 
 - (void)removeSelf {
-  infobar_->RemoveSelf();
+  infobar_->RemoveSelfCocoa();
 }
 
 - (void)addAdditionalControls {
   // Default implementation does nothing.
 }
 
-- (void)infobarWillHide {
-}
-
 - (void)infobarWillClose {
 }
 
@@ -152,6 +149,9 @@
 }
 
 - (void)disablePopUpMenu:(NSMenu*)menu {
+  // Remove the menu if visible.
+  [menu cancelTracking];
+
   // If the menu is re-opened, prevent queries to update items.
   [menu setDelegate:nil];