Move infobar handling to a tab helper.

chrome/browser/tab_contents/infobar_delegate.cc

 // Copyright (c) 2011 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/tab_contents/infobar_delegate.h"
 
 #include "base/logging.h"
 #include "build/build_config.h"
+#include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "content/browser/tab_contents/navigation_details.h"
 #include "content/browser/tab_contents/navigation_entry.h"
 #include "content/browser/tab_contents/tab_contents.h"
 
 // InfoBarDelegate ------------------------------------------------------------
 
 InfoBarDelegate::~InfoBarDelegate() {
 }
 
@@ skipping 50 matching lines @@
     InfoBarDelegate::AsThemePreviewInfobarDelegate() {
   return NULL;
 }
 
 TranslateInfoBarDelegate* InfoBarDelegate::AsTranslateInfoBarDelegate() {
   return NULL;
 }
 
 InfoBarDelegate::InfoBarDelegate(TabContents* contents)
     : contents_unique_id_(0),
       owner_(contents) {

[Peter Kasting, 2011/08/31 18:47:32]

This |owner_| should also change to being an InfoBarTabHelper*.

   if (contents)
     StoreActiveEntryUniqueID(contents);
 }
 
 void InfoBarDelegate::StoreActiveEntryUniqueID(TabContents* contents) {
   NavigationEntry* active_entry = contents->controller().GetActiveEntry();
   contents_unique_id_ = active_entry ? active_entry->unique_id() : 0;
 }
 
 bool InfoBarDelegate::ShouldExpireInternal(
     const content::LoadCommittedDetails& details) const {
   return (contents_unique_id_ != details.entry->unique_id()) ||
       (PageTransition::StripQualifier(details.entry->transition_type()) ==
           PageTransition::RELOAD);
 }
 
 void InfoBarDelegate::RemoveSelf() {
   if (owner_) {
     TabContentsWrapper::GetCurrentWrapperForContents(owner_)->
-        RemoveInfoBar(this);  // Clears |owner_|.
+        infobar_tab_helper()->RemoveInfoBar(this);  // Clears |owner_|.
   }
 }