Remove InfoBarDelegate::InfoBarClosed(), delete InfoBars directly.

chrome/browser/download/download_request_infobar_delegate_unittest.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 "base/memory/scoped_ptr.h"
 #include "chrome/browser/download/download_request_infobar_delegate.h"
 #include "chrome/browser/download/download_request_limiter.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 // MockTabDownloadState -------------------------------------------------------
 
 class MockTabDownloadState : public DownloadRequestLimiter::TabDownloadState {
  public:
   MockTabDownloadState();
   virtual ~MockTabDownloadState();
 
   // DownloadRequestLimiter::TabDownloadState
   virtual void Cancel();
   virtual void Accept();
 
   ConfirmInfoBarDelegate* infobar() {
     return infobar_->AsConfirmInfoBarDelegate();
   }
   void close_infobar() {
-    // TODO(pkasting): Right now InfoBarDelegates delete themselves via
-    // InfoBarClosed(); once InfoBars own their delegates, this can become a
-    // simple reset() call and ~MockTabDownloadState() will no longer need to
-    // call it.
-    if (infobar_ != NULL)
-      infobar_.release()->InfoBarClosed();
+    infobar_.reset(NULL);
   }
   bool responded() const { return responded_; }
   bool accepted() const { return accepted_; }
 
  private:
   // The actual infobar delegate we're listening to.
   scoped_ptr<InfoBarDelegate> infobar_;
 
   // True if we have gotten some sort of response.
   bool responded_;
@@ skipping 41 matching lines @@
   if (state.infobar()->Cancel())
     state.close_infobar();
   EXPECT_FALSE(state.accepted());
 }
 
 TEST(DownloadRequestInfobarDelegate, CloseTest) {
   MockTabDownloadState state;
   state.close_infobar();
   EXPECT_FALSE(state.accepted());
 }