Simplify infobar expiry.

components/autofill/core/browser/autofill_cc_infobar_delegate.cc

 // 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 "components/autofill/core/browser/autofill_cc_infobar_delegate.h"
 
 #include "base/logging.h"
 #include "components/autofill/core/browser/autofill_client.h"
 #include "components/autofill/core/browser/credit_card.h"
 #include "components/autofill/core/browser/personal_data_manager.h"
@@ skipping 42 matching lines @@
 
 infobars::InfoBarDelegate::Type
 AutofillCCInfoBarDelegate::GetInfoBarType() const {
   return PAGE_ACTION_TYPE;
 }
 
 int AutofillCCInfoBarDelegate::GetIconID() const {
   return IDR_INFOBAR_AUTOFILL_CC;
 }
 
-void AutofillCCInfoBarDelegate::InfoBarDismissed() {
-  LogUserAction(AutofillMetrics::INFOBAR_DENIED);
-}
-
-bool AutofillCCInfoBarDelegate::ShouldExpireInternal(
+bool AutofillCCInfoBarDelegate::ShouldExpire(
     const NavigationDetails& details) const {
   // The user has submitted a form, causing the page to navigate elsewhere. We
   // don't want the infobar to be expired at this point, because the user won't
   // get a chance to answer the question.
   return false;
 }
 
+void AutofillCCInfoBarDelegate::InfoBarDismissed() {
+  LogUserAction(AutofillMetrics::INFOBAR_DENIED);
+}
+
 base::string16 AutofillCCInfoBarDelegate::GetMessageText() const {
   return l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_INFOBAR_TEXT);
 }
 
 base::string16 AutofillCCInfoBarDelegate::GetButtonLabel(
     InfoBarButton button) const {
   return l10n_util::GetStringUTF16((button == BUTTON_OK) ?
       IDS_AUTOFILL_CC_INFOBAR_ACCEPT : IDS_AUTOFILL_CC_INFOBAR_DENY);
 }
 
@@ skipping 15 matching lines @@
 
 bool AutofillCCInfoBarDelegate::LinkClicked(WindowOpenDisposition disposition) {
   autofill_client_->LinkClicked(
       GURL(autofill::kHelpURL),
       (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition);
 
   return false;
 }
 
 }  // namespace autofill