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

chrome/browser/tab_contents/infobar.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.h"
 
 #include <cmath>
 
 #include "base/logging.h"
 #include "chrome/browser/tab_contents/infobar_container.h"
+#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "ui/base/animation/slide_animation.h"
 
 SkColor GetInfoBarTopColor(InfoBarDelegate::Type infobar_type) {
   // Yellow
   static const SkColor kWarningBackgroundColorTop =
       SkColorSetRGB(255, 242, 183);
   // Gray
   static const SkColor kPageActionBackgroundColorTop =
       SkColorSetRGB(237, 237, 237);
 
@@ skipping 60 matching lines @@
     arrow_target_height_ = height;
     RecalculateHeights(false);
   }
 }
 
 void InfoBar::AnimationProgressed(const ui::Animation* animation) {
   RecalculateHeights(false);
 }
 
 void InfoBar::RemoveInfoBar() {
-  if (container_)
-    container_->RemoveDelegate(delegate_);
+  owner_->RemoveInfoBar(delegate_);
 }
 
 void InfoBar::SetBarTargetHeight(int height) {
   if (bar_target_height_ != height) {
     bar_target_height_ = height;
     RecalculateHeights(false);
   }
 }
 
 int InfoBar::OffsetY(const gfx::Size& prefsize) const {
@@ skipping 60 matching lines @@
       container_->RemoveInfoBar(this);
     // Note that we only tell the delegate we're closed here, and not when we're
     // simply destroyed (by virtue of a tab switch or being moved from window to
     // window), since this action can cause the delegate to destroy itself.
     delegate_->InfoBarClosed();
     delegate_ = NULL;
   }
 }
 
 #endif  // TOOLKIT_VIEWS