[Autofill] Add upstreaming UKM

components/autofill/core/browser/autofill_manager.cc

 // Copyright 2013 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.
 
 #include "components/autofill/core/browser/autofill_manager.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 188 matching lines @@
   cc_field_http_warning_suggestion.label =
       l10n_util::GetStringUTF16(IDS_AUTOFILL_HTTP_WARNING_LEARN_MORE);
   cc_field_http_warning_suggestion.icon =
       (source_url.is_valid() && source_url.SchemeIs("http"))
           ? base::ASCIIToUTF16("httpWarning")
           : base::ASCIIToUTF16("httpsInvalid");
 
   return cc_field_http_warning_suggestion;
 }
 
+// Logs the card upload decision ukm based on the specified |url| and
+// |upload_decision|. Returns whether the metric was logged sucessfully.
+bool LogCardUploadDecisionMetricUkm(
+    ukm::UkmService* ukm_service,
+    const GURL& url,
+    AutofillMetrics::CardUploadDecisionMetric upload_decision) {
+  if (upload_decision >= AutofillMetrics::NUM_CARD_UPLOAD_DECISION_METRICS)
+    return false;
+
+  std::map<std::string, int> metrics = {
+      {"UploadDecision", static_cast<int>(upload_decision)}};
+  return AutofillMetrics::LogUkm(ukm_service, url,
+                                 "Autofill.CardUploadDecision", metrics);
+}
+
 }  // namespace
 
 AutofillManager::AutofillManager(
     AutofillDriver* driver,
     AutofillClient* client,
     const std::string& app_locale,
     AutofillDownloadManagerState enable_download_manager)
     : driver_(driver),
       client_(client),
       payments_client_(
@@ skipping 813 matching lines @@
     upload_request_.context_token = context_token;
     user_did_accept_upload_prompt_ = false;
     client_->ConfirmSaveCreditCardToCloud(
         upload_request_.card, std::move(legal_message),
         base::Bind(&AutofillManager::OnUserDidAcceptUpload,
                    weak_ptr_factory_.GetWeakPtr()));
     client_->LoadRiskData(base::Bind(&AutofillManager::OnDidGetUploadRiskData,
                                      weak_ptr_factory_.GetWeakPtr()));
     AutofillMetrics::LogCardUploadDecisionMetric(
         AutofillMetrics::UPLOAD_OFFERED);
+    LogCardUploadDecisionMetricUkm(client_->GetUkmService(),
+                                   pending_upload_request_url_,
+                                   AutofillMetrics::UPLOAD_OFFERED);
   } else {
     // If the upload details request failed, fall back to a local save. The
     // reasoning here is as follows:
     // - This will sometimes fail intermittently, in which case it might be
     // better to not fall back, because sometimes offering upload and sometimes
     // offering local save is a poor user experience.
     // - However, in some cases, our local configuration limiting the feature to
     // countries that Payments is known to support will not match Payments' own
     // determination of what country the user is located in. In these cases,
     // the upload details request will consistently fail and if we don't fall
     // back to a local save then the user will never be offered any kind of
     // credit card save.
     client_->ConfirmSaveCreditCardLocally(
         upload_request_.card,
         base::Bind(
             base::IgnoreResult(&PersonalDataManager::SaveImportedCreditCard),
             base::Unretained(personal_data_), upload_request_.card));
     AutofillMetrics::LogCardUploadDecisionMetric(
         AutofillMetrics::UPLOAD_NOT_OFFERED_GET_UPLOAD_DETAILS_FAILED);
+    LogCardUploadDecisionMetricUkm(
+        client_->GetUkmService(), pending_upload_request_url_,
+        AutofillMetrics::UPLOAD_NOT_OFFERED_GET_UPLOAD_DETAILS_FAILED);
   }
+  pending_upload_request_url_ = GURL();
 }
 
 void AutofillManager::OnDidUploadCard(
     AutofillClient::PaymentsRpcResult result) {
   // We don't do anything user-visible if the upload attempt fails.
   // TODO(jdonnelly): Log duration.

[Mathieu, 2017/03/09 20:13:26]

can we add a success log here?

[sebsg, 2017/03/09 20:52:16]

We can but in a different set of metrics? WDYT?

 }
 
 void AutofillManager::OnFullCardRequestSucceeded(const CreditCard& card,
                                                  const base::string16& cvc) {
   credit_card_form_event_logger_->OnDidFillSuggestion(masked_card_);
   FillCreditCardForm(unmasking_query_id_, unmasking_form_, unmasking_field_,
                      card, cvc);
   masked_card_ = CreditCard();
 }
 
@@ skipping 133 matching lines @@
     // client-side validation rules.
     autofill::AutofillMetrics::CardUploadDecisionMetric
         get_profiles_decision_metric = AutofillMetrics::UPLOAD_OFFERED;
     std::string rappor_metric_name;
     bool get_profiles_succeeded =
         GetProfilesForCreditCardUpload(*imported_credit_card,
                                        &upload_request_.profiles,
                                        &get_profiles_decision_metric,
                                        &rappor_metric_name);
 
+    pending_upload_request_url_ = GURL(submitted_form.source_url());
+
     // Both the CVC and address checks are done.  Conform to the legacy order of
     // reporting on CVC then address.
     if (upload_request_.cvc.empty()) {
       AutofillMetrics::LogCardUploadDecisionMetric(
           AutofillMetrics::UPLOAD_NOT_OFFERED_NO_CVC);
+      LogCardUploadDecisionMetricUkm(
+          client_->GetUkmService(), pending_upload_request_url_,
+          AutofillMetrics::UPLOAD_NOT_OFFERED_NO_CVC);
+      pending_upload_request_url_ = GURL();
       CollectRapportSample(submitted_form.source_url(),
                            "Autofill.CardUploadNotOfferedNoCvc");
       return;
     }
     if (!get_profiles_succeeded) {
       DCHECK(get_profiles_decision_metric != AutofillMetrics::UPLOAD_OFFERED);
       AutofillMetrics::LogCardUploadDecisionMetric(
           get_profiles_decision_metric);
+      LogCardUploadDecisionMetricUkm(client_->GetUkmService(),
+                                     pending_upload_request_url_,
+                                     get_profiles_decision_metric);
+      pending_upload_request_url_ = GURL();
       if (!rappor_metric_name.empty()) {
         CollectRapportSample(submitted_form.source_url(), rappor_metric_name);
       }
       return;
     }
 
     // All required data is available, start the upload process.
     payments_client_->GetUploadDetails(upload_request_.profiles, app_locale_);
   }
 }
@@ skipping 947 matching lines @@
     if (i > 0)
       fputs("Next oldest form:\n", file);
   }
   fputs("\n", file);
 
   fclose(file);
 }
 #endif  // ENABLE_FORM_DEBUG_DUMP
 
 }  // namespace autofill