Simplify infobar expiry.

chrome/browser/ui/cocoa/keystone_infobar_delegate.mm

 // Copyright (c) 2012 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/cocoa/keystone_infobar_delegate.h"
 
 #import <AppKit/AppKit.h>
 
 #include <string>
 
@@ skipping 34 matching lines @@
  private:
   explicit KeystonePromotionInfoBarDelegate(PrefService* prefs);
   ~KeystonePromotionInfoBarDelegate() override;
 
   // Sets this info bar to be able to expire.  Called a predetermined amount
   // of time after this object is created.
   void SetCanExpire() { can_expire_ = true; }
 
   // ConfirmInfoBarDelegate
   int GetIconID() const override;
-  bool ShouldExpireInternal(const NavigationDetails& details) const override;
+  bool ShouldExpire(const NavigationDetails& details) const override;
   base::string16 GetMessageText() const override;
   base::string16 GetButtonLabel(InfoBarButton button) const override;
   bool Accept() override;
   bool Cancel() override;
 
   // The prefs to use.
   PrefService* prefs_;  // weak
 
   // Whether the info bar should be dismissed on the next navigation.
   bool can_expire_;
@@ skipping 35 matching lines @@
       kCanExpireOnNavigationAfterDelay);
 }
 
 KeystonePromotionInfoBarDelegate::~KeystonePromotionInfoBarDelegate() {
 }
 
 int KeystonePromotionInfoBarDelegate::GetIconID() const {
   return IDR_PRODUCT_LOGO_32;
 }
 
-bool KeystonePromotionInfoBarDelegate::ShouldExpireInternal(
+bool KeystonePromotionInfoBarDelegate::ShouldExpire(
     const NavigationDetails& details) const {
-  return can_expire_;
+  return can_expire_ && ConfirmInfoBarDelegate::ShouldExpire(details);
 }
 
 base::string16 KeystonePromotionInfoBarDelegate::GetMessageText() const {
   return l10n_util::GetStringFUTF16(IDS_PROMOTE_INFOBAR_TEXT,
       l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
 }
 
 base::string16 KeystonePromotionInfoBarDelegate::GetButtonLabel(
     InfoBarButton button) const {
   return l10n_util::GetStringUTF16((button == BUTTON_OK) ?
@@ skipping 93 matching lines @@
 
 @end  // @implementation KeystonePromotionInfoBar
 
 // static
 void KeystoneInfoBar::PromotionInfoBar(Profile* profile) {
   KeystonePromotionInfoBar* promotionInfoBar =
       [[[KeystonePromotionInfoBar alloc] init] autorelease];
 
   [promotionInfoBar checkAndShowInfoBarForProfile:profile];
 }