| Index: components/autofill/core/browser/autofill_metrics.h | 
| diff --git a/components/autofill/core/browser/autofill_metrics.h b/components/autofill/core/browser/autofill_metrics.h | 
| index d6ae790b392d735a8189229c95cc842609a7fc51..418a716f22da5a715c2d0e865f0fe599ea6db754 100644 | 
| --- a/components/autofill/core/browser/autofill_metrics.h | 
| +++ b/components/autofill/core/browser/autofill_metrics.h | 
| @@ -20,47 +20,6 @@ namespace autofill { | 
|  | 
| class AutofillMetrics { | 
| public: | 
| -  // The possible results of an Autocheckout flow. | 
| -  enum AutocheckoutBuyFlowMetric { | 
| -    // The user has initated Autocheckout. The baseline metric. | 
| -    AUTOCHECKOUT_BUY_FLOW_STARTED, | 
| -    // Autocheckout completed successfully. | 
| -    AUTOCHECKOUT_BUY_FLOW_SUCCESS, | 
| -    // Autocheckout failed due to missing server side data. | 
| -    AUTOCHECKOUT_BUY_FLOW_MISSING_FIELDMAPPING, | 
| -    // Autocheckout failed due to a missing proceed element. | 
| -    AUTOCHECKOUT_BUY_FLOW_MISSING_ADVANCE_ELEMENT, | 
| -    // Autocheckout failed for any number of other reasons, e.g, the proceed | 
| -    // element click failed, the page numbers were not increasing, etc. | 
| -    AUTOCHECKOUT_BUY_FLOW_CANNOT_PROCEED, | 
| -    // Autocheckout failed due to a missing click element before form filling. | 
| -    AUTOCHECKOUT_BUY_FLOW_MISSING_CLICK_ELEMENT_BEFORE_FORM_FILLING, | 
| -    // Autocheckout failed due to a missing click element after form filling. | 
| -    AUTOCHECKOUT_BUY_FLOW_MISSING_CLICK_ELEMENT_AFTER_FORM_FILLING, | 
| -    NUM_AUTOCHECKOUT_BUY_FLOW_METRICS | 
| -  }; | 
| - | 
| -  // The success or failure of Autocheckout. | 
| -  enum AutocheckoutCompletionStatus { | 
| -    AUTOCHECKOUT_CANCELLED,  // The user canceled Autocheckout while it was in | 
| -                             // progress. | 
| -    AUTOCHECKOUT_FAILED,     // The user canceled out of the dialog after | 
| -                             // an Autocheckout failure. | 
| -    AUTOCHECKOUT_SUCCEEDED,  // The dialog was closed after Autocheckout | 
| -                             // succeeded. | 
| -  }; | 
| - | 
| -  // The action a user took to dismiss a bubble. | 
| -  enum BubbleMetric { | 
| -    BUBBLE_CREATED = 0,         // The bubble was created. | 
| -    BUBBLE_ACCEPTED,            // The user accepted, i.e. confirmed, the | 
| -                                // bubble. | 
| -    BUBBLE_DISMISSED,           // The user dismissed the bubble. | 
| -    BUBBLE_IGNORED,             // The user did not interact with the bubble. | 
| -    BUBBLE_COULD_BE_DISPLAYED,  // The bubble could be displayed. | 
| -    NUM_BUBBLE_METRICS, | 
| -  }; | 
| - | 
| enum DeveloperEngagementMetric { | 
| // Parsed a form that is potentially autofillable. | 
| FILLABLE_FORM_PARSED = 0, | 
| @@ -119,8 +78,8 @@ class AutofillMetrics { | 
| NUM_DIALOG_INITIAL_USER_STATE_METRICS | 
| }; | 
|  | 
| -  // Events related to the Autofill popup shown in a requestAutocomplete or | 
| -  // Autocheckout dialog. | 
| +  // Events related to the Autofill popup shown in a requestAutocomplete | 
| +  // dialog. | 
| enum DialogPopupEvent { | 
| // An Autofill popup was shown. | 
| DIALOG_POPUP_SHOWN = 0, | 
| @@ -296,7 +255,6 @@ class AutofillMetrics { | 
| AUTHENTICATE_INSTRUMENT, | 
| GET_FULL_WALLET, | 
| GET_WALLET_ITEMS, | 
| -    SEND_STATUS, | 
| SAVE_TO_WALLET, | 
| }; | 
|  | 
| @@ -362,22 +320,9 @@ class AutofillMetrics { | 
| NUM_WALLET_REQUIRED_ACTIONS | 
| }; | 
|  | 
| -  // The success or failure of downloading Autocheckout whitelist file. | 
| -  enum AutocheckoutWhitelistDownloadStatus { | 
| -    AUTOCHECKOUT_WHITELIST_DOWNLOAD_FAILED, | 
| -    AUTOCHECKOUT_WHITELIST_DOWNLOAD_SUCCEEDED, | 
| -  }; | 
| - | 
| AutofillMetrics(); | 
| virtual ~AutofillMetrics(); | 
|  | 
| -  // Logs how the user interacted with the Autocheckout bubble. | 
| -  virtual void LogAutocheckoutBubbleMetric(BubbleMetric metric) const; | 
| - | 
| -  // Logs the result of an Autocheckout buy flow. | 
| -  virtual void LogAutocheckoutBuyFlowMetric( | 
| -      AutocheckoutBuyFlowMetric metric) const; | 
| - | 
| virtual void LogCreditCardInfoBarMetric(InfoBarMetric metric) const; | 
|  | 
| virtual void LogDeveloperEngagementMetric( | 
| @@ -454,15 +399,6 @@ class AutofillMetrics { | 
| autofill::DialogType dialog_type, | 
| WalletRequiredActionMetric required_action) const; | 
|  | 
| -  virtual void LogAutocheckoutDuration( | 
| -      const base::TimeDelta& duration, | 
| -      AutocheckoutCompletionStatus status) const; | 
| - | 
| -  // Logs the time taken to download Autocheckout whitelist file. | 
| -  virtual void LogAutocheckoutWhitelistDownloadDuration( | 
| -      const base::TimeDelta& duration, | 
| -      AutocheckoutWhitelistDownloadStatus status) const; | 
| - | 
| // This should be called when a form that has been Autofilled is submitted. | 
| // |duration| should be the time elapsed between form load and submission. | 
| virtual void LogFormFillDurationFromLoadWithAutofill( | 
|  |