Revert of Don't deref stale AutofillMetrics pointer in AutofillCCInfoBarDelegate

components/autofill/core/browser/test_autofill_client.h

 // Copyright 2014 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.
 
 #ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_TEST_AUTOFILL_CLIENT_H_
 #define COMPONENTS_AUTOFILL_CORE_BROWSER_TEST_AUTOFILL_CLIENT_H_
 
 #include "base/compiler_specific.h"
 #include "base/i18n/rtl.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
 #include "components/autofill/core/browser/autofill_client.h"
 
 namespace autofill {
 
 // This class is for easier writing of tests.
 class TestAutofillClient : public AutofillClient {
  public:
   TestAutofillClient();
   ~TestAutofillClient() override;
 
   // AutofillClient implementation.
   PersonalDataManager* GetPersonalDataManager() override;
   scoped_refptr<AutofillWebDataService> GetDatabase() override;
   PrefService* GetPrefs() override;
   void HideRequestAutocompleteDialog() override;
   void ShowAutofillSettings() override;
-  void ConfirmSaveCreditCard(const base::Closure& save_card_callback) override;
+  void ConfirmSaveCreditCard(const AutofillMetrics& metric_logger,
+                             const base::Closure& save_card_callback) override;
   bool HasCreditCardScanFeature() override;
   void ScanCreditCard(const CreditCardScanCallback& callback) override;
   void ShowRequestAutocompleteDialog(const FormData& form,
                                      const GURL& source_url,
                                      const ResultCallback& callback) override;
   void ShowAutofillPopup(
       const gfx::RectF& element_bounds,
       base::i18n::TextDirection text_direction,
       const std::vector<base::string16>& values,
       const std::vector<base::string16>& labels,
@@ skipping 17 matching lines @@
  private:
   // NULL by default.
   scoped_ptr<PrefService> prefs_;
 
   DISALLOW_COPY_AND_ASSIGN(TestAutofillClient);
 };
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_TEST_AUTOFILL_CLIENT_H_