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

chrome/browser/tab_contents/infobar_container.h

 // 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.
 
 #ifndef CHROME_BROWSER_TAB_CONTENTS_INFOBAR_CONTAINER_H_
 #define CHROME_BROWSER_TAB_CONTENTS_INFOBAR_CONTAINER_H_
 #pragma once
 
 #include <vector>
 
@@ skipping 54 matching lines @@
   // IMPORTANT: This MUST NOT result in a call back to
   // Delegate::InfoBarContainerStateChanged() unless it causes an actual
   // change, lest we infinitely recurse.
   void SetMaxTopArrowHeight(int height);
 
   // Called when a contained infobar has animated or by some other means changed
   // its height, or when it stops animating.  The container is expected to do
   // anything necessary to respond, e.g. re-layout.
   void OnInfoBarStateChanged(bool is_animating);
 
-  // Removes the specified InfoBarDelegate from the selected TabContentsWrapper.
-  // This will notify us back and cause us to close the InfoBar.  This is called
-  // from the InfoBar's close button handler.
-  void RemoveDelegate(InfoBarDelegate* delegate);
-
   // Called by |infobar| to request that it be removed from the container, as it
   // is about to delete itself.  At this point, |infobar| should already be
   // hidden.
   void RemoveInfoBar(InfoBar* infobar);
 
   const Delegate* delegate() const { return delegate_; }
 
  protected:
   // Subclasses must call this during destruction, so that we can remove
   // infobars (which will call the pure virtual functions below) while the
@@ skipping 39 matching lines @@
   TabContentsWrapper* tab_contents_;
   InfoBars infobars_;
 
   // Calculated in SetMaxTopArrowHeight().
   int top_arrow_target_height_;
 
   DISALLOW_COPY_AND_ASSIGN(InfoBarContainer);
 };
 
 #endif  // CHROME_BROWSER_TAB_CONTENTS_INFOBAR_CONTAINER_H_