infobars: Use TCW directly in InfoBar to remove the delegate.

chrome/browser/tab_contents/infobar_container.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.
 
 #if defined(TOOLKIT_VIEWS)  // TODO(pkasting): Port non-views to use this.
 
 #include "chrome/browser/tab_contents/infobar_container.h"
 
 #include "chrome/browser/tab_contents/infobar.h"
 #include "chrome/browser/tab_contents/infobar_delegate.h"
@@ skipping 78 matching lines @@
       std::max(height - InfoBar::kSeparatorLineHeight, 0),
       InfoBar::kMaximumArrowTargetHeight);
   UpdateInfoBarArrowTargetHeights();
 }
 
 void InfoBarContainer::OnInfoBarStateChanged(bool is_animating) {
   if (delegate_)
     delegate_->InfoBarContainerStateChanged(is_animating);
 }
 
-void InfoBarContainer::RemoveDelegate(InfoBarDelegate* delegate) {
-  tab_contents_->RemoveInfoBar(delegate);
-}
-
 void InfoBarContainer::RemoveInfoBar(InfoBar* infobar) {
   InfoBars::iterator infobar_iterator(std::find(infobars_.begin(),
                                                 infobars_.end(), infobar));
   DCHECK(infobar_iterator != infobars_.end());
   PlatformSpecificRemoveInfoBar(infobar);
   infobars_.erase(infobar_iterator);
 }
 
 void InfoBarContainer::RemoveAllInfoBarsForDestruction() {
   // Before we remove any children, we reset |delegate_|, so that no removals
@@ skipping 90 matching lines @@
     return InfoBar::kDefaultArrowTargetHeight;
   // When the first infobar is animating closed, we animate the second infobar's
   // arrow target height from the default to the top target height.  Note that
   // the animation values here are going from 1.0 -> 0.0 as the top bar closes.
   return top_arrow_target_height_ + static_cast<int>(
       (InfoBar::kDefaultArrowTargetHeight - top_arrow_target_height_) *
           first_infobar_animation->GetCurrentValue());
 }
 
 #endif  // TOOLKIT_VIEWS