Make TabContents own its infobar delegates....

chrome/browser/ui/views/infobars/infobar_container.cc

 // 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 "chrome/browser/views/infobars/infobar_container.h"
 
 #include "app/l10n_util.h"
 #include "chrome/browser/tab_contents/infobar_delegate.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/view_ids.h"
@@ skipping 86 matching lines @@
 // InfoBarContainer, NotificationObserver implementation: ----------------------
 
 void InfoBarContainer::Observe(NotificationType type,
                                const NotificationSource& source,
                                const NotificationDetails& details) {
   if (type == NotificationType::TAB_CONTENTS_INFOBAR_ADDED) {
     AddInfoBar(Details<InfoBarDelegate>(details).ptr(), true);  // animated
   } else if (type == NotificationType::TAB_CONTENTS_INFOBAR_REMOVED) {
     RemoveInfoBar(Details<InfoBarDelegate>(details).ptr(), true);  // animated
   } else if (type == NotificationType::TAB_CONTENTS_INFOBAR_REPLACED) {
-    std::pair<InfoBarDelegate*, InfoBarDelegate*>* delegates =
-        Details<std::pair<InfoBarDelegate*, InfoBarDelegate*> >(details).ptr();
-    ReplaceInfoBar(delegates->first, delegates->second);
+    typedef std::pair<InfoBarDelegate*, InfoBarDelegate*> DelegatePair;
+    DelegatePair* delegate_pair = Details<DelegatePair>(details).ptr();
+    ReplaceInfoBar(delegate_pair->first, delegate_pair->second);
   } else {
     NOTREACHED();
   }
 }
 
 // InfoBarContainer, private: --------------------------------------------------
 
 void InfoBarContainer::UpdateInfoBars() {
   for (int i = 0; i < tab_contents_->infobar_delegate_count(); ++i) {
     InfoBarDelegate* delegate = tab_contents_->GetInfoBarDelegateAt(i);
@@ skipping 35 matching lines @@
       break;
     }
   }
 }
 
 void InfoBarContainer::ReplaceInfoBar(InfoBarDelegate* old_delegate,
                                       InfoBarDelegate* new_delegate) {
   RemoveInfoBar(old_delegate, false);  // no animation
   AddInfoBar(new_delegate, false);  // no animation
 }