[AF][Nickname] Clean up the Phase 1 histogram logging

Remove server nickname metrics logging since the feature is fully
enabled and we don't need to maintain metrics for analysis post launch.

Bug: 1059087
Change-Id: I07a6b8a0fc277bcf7634a26842930ed0d5978316
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2495794
Commit-Queue: Sujie Zhu <sujiezhu@google.com>
Reviewed-by: Jared Saul <jsaul@google.com>
Reviewed-by: Brian White <bcwhite@chromium.org>
Reviewed-by: Siyu An <siyua@chromium.org>
Reviewed-by: Dominic Battré <battre@chromium.org>
Cr-Commit-Position: refs/heads/master@{#821985}

components/autofill/core/browser/metrics/credit_card_form_event_logger.cc

@@ -13,7 +13,6 @@
 #include "components/autofill/core/browser/form_data_importer.h"
 #include "components/autofill/core/browser/payments/credit_card_access_manager.h"
 #include "components/autofill/core/browser/validation.h"
-#include "components/autofill/core/common/autofill_tick_clock.h"
 
 namespace autofill {
 
@@ -50,19 +49,6 @@ void CreditCardFormEventLogger::OnDidSelectCardSuggestion(
     AutofillSyncSigninState sync_state) {
   sync_state_ = sync_state;
 
-  // When server nicknames are available, if any card is selected, log the
-  // selection duration.
-  if (has_server_nickname_ && !has_logged_suggestion_selected_timestamp_) {
-    has_logged_suggestion_selected_timestamp_ = true;
-    base::TimeTicks now = AutofillTickClock::NowTicks();
-    // Suggestion selection should always chronologically follow suggestion
-    // shown.
-    DCHECK(now > first_suggestion_shown_timestamp_);
-    base::UmaHistogramMediumTimes(
-        "Autofill.FormEvents.CreditCard.WithServerNickname.SelectionDuration",
-        now - first_suggestion_shown_timestamp_);
-  }
-
   if (has_eligible_offer_) {
     card_selected_has_offer_ = DoesCardHaveOffer(credit_card);
     base::UmaHistogramBoolean("Autofill.Offer.SelectedCardHasOffer",
@@ -189,8 +175,6 @@ void CreditCardFormEventLogger::LogUkmInteractedWithForm(
 }
 
 void CreditCardFormEventLogger::OnSuggestionsShownOnce() {
-  // Record the timestamp of the first suggestion shown.
-  first_suggestion_shown_timestamp_ = AutofillTickClock::NowTicks();
   base::UmaHistogramBoolean("Autofill.Offer.SuggestedCardsHaveOffer",
                             has_eligible_offer_);
 }
@@ -214,14 +198,6 @@ void CreditCardFormEventLogger::OnLog(const std::string& name,
                                   NUM_FORM_EVENTS);
   }
 
-  // Log a different histogram for credit card forms with server nickname
-  // available so that selection rate with server nickname can be compared on
-  // their own.
-  if (has_server_nickname_) {
-    base::UmaHistogramEnumeration(name + ".WithServerNickname", event,
-                                  NUM_FORM_EVENTS);
-  }
-
   // Log a different histogram for credit card forms with credit card offers
   // available so that selection rate with offers and rewards can be compared on
   // their own.

components/autofill/core/browser/metrics/credit_card_form_event_logger.h

@@ -46,10 +46,6 @@ class CreditCardFormEventLogger : public FormEventLoggerBase {
     is_context_secure_ = is_context_secure;
   }
 
-  void set_has_server_nickname(bool has_server_nickname) {
-    has_server_nickname_ = has_server_nickname;
-  }
-
   void set_suggestions(std::vector<Suggestion> suggestions);
 
   void OnDidSelectCardSuggestion(const CreditCard& credit_card,
@@ -97,18 +93,11 @@ class CreditCardFormEventLogger : public FormEventLoggerBase {
   bool is_context_secure_ = false;
   UnmaskAuthFlowType current_authentication_flow_;
   bool has_logged_masked_server_card_suggestion_selected_ = false;
-  bool has_logged_suggestion_selected_timestamp_ = false;
   bool logged_suggestion_filled_was_masked_server_card_ = false;
-  base::TimeTicks first_suggestion_shown_timestamp_;
   std::vector<Suggestion> suggestions_;
   bool has_eligible_offer_ = false;
   bool card_selected_has_offer_ = false;
 
-  // True when ANY of the masked server cards has a nickname. Note that,
-  // depending on the experimental setup, the user may not be shown the
-  // nickname.
-  bool has_server_nickname_ = false;
-
   // Weak references.
   PersonalDataManager* personal_data_manager_;
   AutofillClient* client_;

components/autofill/core/browser/payments/credit_card_access_manager.cc

@@ -79,21 +79,12 @@ void CreditCardAccessManager::UpdateCreditCardFormEventLogger() {
 
   size_t server_record_type_count = 0;
   size_t local_record_type_count = 0;
-  bool has_server_nickname = false;
   for (CreditCard* credit_card : credit_cards) {
-    // If any masked server card has valid nickname, we will set to true no
-    // matter the flag is enabled or not.
-    if (credit_card->record_type() == CreditCard::MASKED_SERVER_CARD &&
-        credit_card->HasNonEmptyValidNickname()) {
-      has_server_nickname = true;
-    }
-
     if (credit_card->record_type() == CreditCard::LOCAL_CARD)
       local_record_type_count++;
     else
       server_record_type_count++;
   }
-  form_event_logger_->set_has_server_nickname(has_server_nickname);
   form_event_logger_->set_server_record_type_count(server_record_type_count);
   form_event_logger_->set_local_record_type_count(local_record_type_count);
   form_event_logger_->set_is_context_secure(client_->IsContextSecure());

tools/metrics/histograms/histograms_xml/autofill/histograms.xml

@@ -763,6 +763,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Autofill.FormEvents.CreditCard.WithServerNickname"
     enum="AutofillFormEvent" expires_after="2021-04-01">
+  <obsolete>
+    Removed 10/2020 as it is launched and no longer needed for analysis.
+  </obsolete>
   <owner>sujiezhu@google.com</owner>
   <owner>jsaul@google.com</owner>
   <summary>
@@ -783,6 +786,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram
     name="Autofill.FormEvents.CreditCard.WithServerNickname.SelectionDuration"
     units="units" expires_after="2021-04-01">
+  <obsolete>
+    Removed 10/2020 as it is launched and no longer needed for analysis.
+  </obsolete>
   <owner>sujiezhu@google.com</owner>
   <owner>jsaul@google.com</owner>
   <summary>