Fix logging bug where shown logs it as user interacted.

Had interacted is being logged just when prompt is shown.
Introduced shown boolean to denote that
and fixed logging for had_user_interacted.


Bug: 848955
Change-Id: Ib3d17ab567b88c7ebda2dbe08cb3e46cf0807924
Reviewed-on: https://chromium-review.googlesource.com/c/1372281
Commit-Queue: Lakshmi Kumar Dabbiru <dlkumar@google.com>
Reviewed-by: Sebastien Seguin-Gagnon <sebsg@chromium.org>
Reviewed-by: Jared Saul <jsaul@google.com>
Cr-Commit-Position: refs/heads/master@{#615688}

components/autofill/core/browser/ui/card_name_fix_flow_view_delegate_mobile.cc

@@ -19,15 +19,17 @@ CardNameFixFlowViewDelegateMobile::CardNameFixFlowViewDelegateMobile(
     const base::string16& inferred_cardholder_name,
     base::OnceCallback<void(const base::string16&)> upload_save_card_callback)
     : inferred_cardholder_name_(inferred_cardholder_name),
-      upload_save_card_callback_(std::move(upload_save_card_callback)) {
+      upload_save_card_callback_(std::move(upload_save_card_callback)),
+      shown_(false),
+      had_user_interaction_(false) {
   DCHECK(!upload_save_card_callback_.is_null());
   AutofillMetrics::LogSaveCardCardholderNamePrefilled(
       !inferred_cardholder_name_.empty());
 }
 
 CardNameFixFlowViewDelegateMobile::~CardNameFixFlowViewDelegateMobile() {
-  if (!had_user_interaction_)
-    LogUserAction(
+  if (shown_ && !had_user_interaction_)
+    AutofillMetrics::LogCardholderNameFixFlowPromptEvent(
         AutofillMetrics::
             CARDHOLDER_NAME_FIX_FLOW_PROMPT_CLOSED_WITHOUT_INTERACTION);
 }
@@ -52,24 +54,23 @@ base::string16 CardNameFixFlowViewDelegateMobile::GetSaveButtonLabel() const {
 
 void CardNameFixFlowViewDelegateMobile::Accept(const base::string16& name) {
   std::move(upload_save_card_callback_).Run(name);
-  LogUserAction(AutofillMetrics::CARDHOLDER_NAME_FIX_FLOW_PROMPT_ACCEPTED);
+  AutofillMetrics::LogCardholderNameFixFlowPromptEvent(
+      AutofillMetrics::CARDHOLDER_NAME_FIX_FLOW_PROMPT_ACCEPTED);
+  had_user_interaction_ = true;
   AutofillMetrics::LogSaveCardCardholderNameWasEdited(
       inferred_cardholder_name_ != name);
 }
 
 void CardNameFixFlowViewDelegateMobile::Dismissed() {
-  LogUserAction(AutofillMetrics::CARDHOLDER_NAME_FIX_FLOW_PROMPT_DISMISSED);
+  AutofillMetrics::LogCardholderNameFixFlowPromptEvent(
+      AutofillMetrics::CARDHOLDER_NAME_FIX_FLOW_PROMPT_DISMISSED);
+  had_user_interaction_ = true;
 }
 
 void CardNameFixFlowViewDelegateMobile::Shown() {
-  LogUserAction(AutofillMetrics::CARDHOLDER_NAME_FIX_FLOW_PROMPT_SHOWN);
-}
-
-void CardNameFixFlowViewDelegateMobile::LogUserAction(
-    AutofillMetrics::CardholderNameFixFlowPromptEvent user_action) {
-  DCHECK(!had_user_interaction_);
-  AutofillMetrics::LogCardholderNameFixFlowPromptEvent(user_action);
-  had_user_interaction_ = true;
+  AutofillMetrics::LogCardholderNameFixFlowPromptEvent(
+      AutofillMetrics::CARDHOLDER_NAME_FIX_FLOW_PROMPT_SHOWN);
+  shown_ = true;
 }
 
 }  // namespace autofill

components/autofill/core/browser/ui/card_name_fix_flow_view_delegate_mobile.h

@@ -34,8 +34,6 @@ class CardNameFixFlowViewDelegateMobile {
   void Shown();
 
  private:
-  void LogUserAction(
-      AutofillMetrics::CardholderNameFixFlowPromptEvent user_action);
 
   // Inferred cardholder name from Gaia account.
   base::string16 inferred_cardholder_name_;
@@ -44,6 +42,9 @@ class CardNameFixFlowViewDelegateMobile {
   // fix flow.
   base::OnceCallback<void(const base::string16&)> upload_save_card_callback_;
 
+  // Whether the prompt was shown to the user.
+  bool shown_;
+
   // Did the user ever explicitly accept or dismiss this prompt?
   bool had_user_interaction_;