Don't deref stale AutofillMetrics pointer in AutofillCCInfoBarDelegate

chrome/browser/autofill/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 "chrome/browser/autofill/autofill_cc_infobar_delegate.h"
 
 #include "base/logging.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/google_chrome_strings.h"
@@ skipping 18 matching lines @@
   infobar_service->AddInfoBar(ConfirmInfoBarDelegate::CreateInfoBar(
       scoped_ptr<ConfirmInfoBarDelegate>(new AutofillCCInfoBarDelegate(
           metric_logger, save_card_callback))));
 }
 
 AutofillCCInfoBarDelegate::AutofillCCInfoBarDelegate(
     const AutofillMetrics* metric_logger,
     const base::Closure& save_card_callback)
     : ConfirmInfoBarDelegate(),
       metric_logger_(metric_logger),
-      save_card_callback_(save_card_callback),
-      had_user_interaction_(false) {
+      save_card_callback_(save_card_callback) {
   metric_logger->LogCreditCardInfoBarMetric(AutofillMetrics::INFOBAR_SHOWN);
 }
 
 AutofillCCInfoBarDelegate::~AutofillCCInfoBarDelegate() {
-  if (!had_user_interaction_)
-    LogUserAction(AutofillMetrics::INFOBAR_IGNORED);
 }
 
 void AutofillCCInfoBarDelegate::LogUserAction(
     AutofillMetrics::InfoBarMetric user_action) {
-  DCHECK(!had_user_interaction_);
-
-  metric_logger_->LogCreditCardInfoBarMetric(user_action);

[Ilya Sherman, 2014/12/05 22:58:54]

Rather than breaking the metrics, let's just make this a static method, and
update the tests.  To update the tests, you can follow my example from
https://codereview.chromium.org/714273003/

[Evan Stade, 2014/12/05 23:42:47]

Done.

"Break" is a strong word. I'd instead say "Improve by removing redundancy". But
I agree that AutofillMetrics has no reason to be an instance object, and fixing
that will simplify a lot of code.

-  had_user_interaction_ = true;
 }
 
 void AutofillCCInfoBarDelegate::InfoBarDismissed() {
   LogUserAction(AutofillMetrics::INFOBAR_DENIED);
 }
 
 int AutofillCCInfoBarDelegate::GetIconID() const {
   return IDR_INFOBAR_AUTOFILL_CC;
 }
 
@@ skipping 15 matching lines @@
 }
 
 base::string16 AutofillCCInfoBarDelegate::GetButtonLabel(
     InfoBarButton button) const {
   return l10n_util::GetStringUTF16((button == BUTTON_OK) ?
       IDS_AUTOFILL_CC_INFOBAR_ACCEPT : IDS_AUTOFILL_CC_INFOBAR_DENY);
 }
 
 bool AutofillCCInfoBarDelegate::Accept() {
   save_card_callback_.Run();
-  save_card_callback_.Reset();
-  LogUserAction(AutofillMetrics::INFOBAR_ACCEPTED);
+  metric_logger_->LogCreditCardInfoBarMetric(AutofillMetrics::INFOBAR_ACCEPTED);
   return true;
 }
 
 bool AutofillCCInfoBarDelegate::Cancel() {
-  LogUserAction(AutofillMetrics::INFOBAR_DENIED);
+  metric_logger_->LogCreditCardInfoBarMetric(AutofillMetrics::INFOBAR_DENIED);
   return true;
 }
 
 base::string16 AutofillCCInfoBarDelegate::GetLinkText() const {
   return l10n_util::GetStringUTF16(IDS_LEARN_MORE);
 }
 
 bool AutofillCCInfoBarDelegate::LinkClicked(WindowOpenDisposition disposition) {
   InfoBarService::WebContentsFromInfoBar(infobar())->OpenURL(
       content::OpenURLParams(
           GURL(autofill::kHelpURL), content::Referrer(),
           (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
           ui::PAGE_TRANSITION_LINK, false));
   return false;
 }
 
 }  // namespace autofill