Revert of Don't deref stale AutofillMetrics pointer in AutofillCCInfoBarDelegate

android_webview/native/aw_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 ANDROID_WEBVIEW_NATIVE_AW_AUTOFILL_CLIENT_H_
 #define ANDROID_WEBVIEW_NATIVE_AW_AUTOFILL_CLIENT_H_
 
 #include <jni.h>
 #include <vector>
 
@@ skipping 44 matching lines @@
   bool GetSaveFormData();
 
   // AutofillClient:
   virtual autofill::PersonalDataManager* GetPersonalDataManager() override;
   virtual scoped_refptr<autofill::AutofillWebDataService> GetDatabase()
       override;
   virtual PrefService* GetPrefs() override;
   virtual void HideRequestAutocompleteDialog() override;
   virtual void ShowAutofillSettings() override;
   virtual void ConfirmSaveCreditCard(
+      const autofill::AutofillMetrics& metric_logger,
       const base::Closure& save_card_callback) override;
   virtual bool HasCreditCardScanFeature() override;
   virtual void ScanCreditCard(const CreditCardScanCallback& callback) override;
   virtual void ShowRequestAutocompleteDialog(
       const autofill::FormData& form,
       const GURL& source_url,
       const ResultCallback& callback) override;
   virtual void ShowAutofillPopup(
       const gfx::RectF& element_bounds,
       base::i18n::TextDirection text_direction,
@@ skipping 38 matching lines @@
   base::WeakPtr<autofill::AutofillPopupDelegate> delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(AwAutofillClient);
 };
 
 bool RegisterAwAutofillClient(JNIEnv* env);
 
 }  // namespace android_webview
 
 #endif  // ANDROID_WEBVIEW_NATIVE_AW_AUTOFILL_CLIENT_H_