Make TabContents own its infobar delegates....

chrome/browser/cocoa/infobar_container_controller.mm

 // Copyright (c) 2010 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 "base/logging.h"
 #include "base/mac_util.h"
 #import "chrome/browser/cocoa/animatable_view.h"
 #include "chrome/browser/cocoa/infobar.h"
 #import "chrome/browser/cocoa/infobar_container_controller.h"
 #import "chrome/browser/cocoa/infobar_controller.h"
@@ skipping 20 matching lines @@
       case NotificationType::TAB_CONTENTS_INFOBAR_ADDED:
         [controller_ addInfoBar:Details<InfoBarDelegate>(details).ptr()
                         animate:YES];
         break;
       case NotificationType::TAB_CONTENTS_INFOBAR_REMOVED:
         [controller_
           closeInfoBarsForDelegate:Details<InfoBarDelegate>(details).ptr()
                            animate:YES];
         break;
       case NotificationType::TAB_CONTENTS_INFOBAR_REPLACED: {
-        typedef std::pair<InfoBarDelegate*, InfoBarDelegate*>
-            InfoBarDelegatePair;
-        InfoBarDelegatePair* delegates =
-            Details<InfoBarDelegatePair>(details).ptr();
-        [controller_
-         replaceInfoBarsForDelegate:delegates->first with:delegates->second];
+        typedef std::pair<InfoBarDelegate*, InfoBarDelegate*> DelegatePair;
+        DelegatePair* delegate_pair = Details<DelegatePair>(details).ptr();
+        [controller_ replaceInfoBarsForDelegate:delegate_pair->first
+                                           with:delegate_pair->second];
         break;
       }
       default:
         NOTREACHED();  // we don't ask for anything else!
         break;
     }
 
     [controller_ positionInfoBarsAndRedraw];
   }
 
@@ skipping 162 matching lines @@
     frame.size.width = NSWidth(containerBounds);
     frame.origin.y = minY;
     minY += frame.size.height;
     [view setFrame:frame];
   }
 
   [resizeDelegate_ resizeView:[self view] newHeight:[self desiredHeight]];
 }
 
 @end