Fix DCHECK() in infobar animation.

chrome/browser/ui/views/infobars/extension_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/ui/views/infobars/extension_infobar.h"
 
 #include "chrome/browser/extensions/extension_context_menu_model.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_infobar_delegate.h"
 #include "chrome/browser/platform_util.h"
@@ skipping 25 matching lines @@
 
 ExtensionInfoBar::ExtensionInfoBar(ExtensionInfoBarDelegate* delegate)
     : InfoBarView(delegate),
       delegate_(delegate),
       menu_(NULL),
       ALLOW_THIS_IN_INITIALIZER_LIST(tracker_(this)) {
   delegate->set_observer(this);
 
   ExtensionView* extension_view = delegate->extension_host()->view();
   int height = extension_view->GetPreferredSize().height();
-  set_target_height((height > 0) ?
+  SetTargetHeight((height > 0) ?
       (height + InfoBarBackground::kSeparatorLineHeight) : height);
 
   // Get notified of resize events for the ExtensionView.
   extension_view->SetContainer(this);
 }
 
 ExtensionInfoBar::~ExtensionInfoBar() {
   if (GetDelegate()) {
     GetDelegate()->extension_host()->view()->SetContainer(NULL);
     GetDelegate()->set_observer(NULL);
@@ skipping 66 matching lines @@
   // infobar view).
   if (delegate->closing())
     return;
 
   view->SetVisible(true);
 
   if (height() == 0)
     animation()->Reset(0.0);
 
   // Clamp height to a min and a max size of between 1 and 2 InfoBars.
-  set_target_height(std::min(2 * kDefaultTargetHeight,
+  SetTargetHeight(std::min(2 * kDefaultTargetHeight,
       std::max(kDefaultTargetHeight, view->GetPreferredSize().height())));
 
   animation()->Show();
 }
 
 void ExtensionInfoBar::OnImageLoaded(SkBitmap* image,
                                      const ExtensionResource& resource,
                                      int index) {
   if (!GetDelegate())
     return;  // The delegate can go away while we asynchronously load images.
@@ skipping 40 matching lines @@
                                                            NULL);
   }
 
   options_menu_menu_.reset(new views::Menu2(options_menu_contents_.get()));
   options_menu_menu_->RunMenuAt(pt, views::Menu2::ALIGN_TOPLEFT);
 }
 
 ExtensionInfoBarDelegate* ExtensionInfoBar::GetDelegate() {
   return delegate_ ? delegate_->AsExtensionInfoBarDelegate() : NULL;
 }