Refactor UKM interface for mojo-ification

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 212 matching lines @@
       client_(client),
       payments_client_(base::MakeUnique<payments::PaymentsClient>(
           driver->GetURLRequestContext(),
           this)),
       app_locale_(app_locale),
       personal_data_(client->GetPersonalDataManager()),
       autocomplete_history_manager_(
           base::MakeUnique<AutocompleteHistoryManager>(driver, client)),
       form_interactions_ukm_logger_(
           base::MakeUnique<AutofillMetrics::FormInteractionsUkmLogger>(
-              client->GetUkmService())),
+              client->GetUkmRecorder())),
       address_form_event_logger_(
           base::MakeUnique<AutofillMetrics::FormEventLogger>(
               false /* is_for_credit_card */,
               form_interactions_ukm_logger_.get())),
       credit_card_form_event_logger_(
           base::MakeUnique<AutofillMetrics::FormEventLogger>(
               true /* is_for_credit_card */,
               form_interactions_ukm_logger_.get())),
       has_logged_autofill_enabled_(false),
       has_logged_address_suggestions_count_(false),
@@ skipping 1286 matching lines @@
       std::string() /* login_form_signature */, observed_submission);
 }
 
 void AutofillManager::Reset() {
   // Note that upload_request_ is not reset here because the prompt to
   // save a card is shown after page navigation.
   ProcessPendingFormForUpload();
   DCHECK(!pending_form_data_);
   form_structures_.clear();
   form_interactions_ukm_logger_.reset(
-      new AutofillMetrics::FormInteractionsUkmLogger(client_->GetUkmService()));
+      new AutofillMetrics::FormInteractionsUkmLogger(
+          client_->GetUkmRecorder()));
   address_form_event_logger_.reset(new AutofillMetrics::FormEventLogger(
       false /* is_for_credit_card */, form_interactions_ukm_logger_.get()));
   credit_card_form_event_logger_.reset(new AutofillMetrics::FormEventLogger(
       true /* is_for_credit_card */, form_interactions_ukm_logger_.get()));
 #if defined(OS_ANDROID) || defined(OS_IOS)
   autofill_assistant_.Reset();
 #endif
   has_logged_autofill_enabled_ = false;
   has_logged_address_suggestions_count_ = false;
   did_show_suggestions_ = false;
@@ skipping 16 matching lines @@
       client_(client),
       payments_client_(base::MakeUnique<payments::PaymentsClient>(
           driver->GetURLRequestContext(),
           this)),
       app_locale_("en-US"),
       personal_data_(personal_data),
       autocomplete_history_manager_(
           base::MakeUnique<AutocompleteHistoryManager>(driver, client)),
       form_interactions_ukm_logger_(
           base::MakeUnique<AutofillMetrics::FormInteractionsUkmLogger>(
-              client->GetUkmService())),
+              client->GetUkmRecorder())),
       address_form_event_logger_(
           base::MakeUnique<AutofillMetrics::FormEventLogger>(
               false /* is_for_credit_card */,
               form_interactions_ukm_logger_.get())),
       credit_card_form_event_logger_(
           base::MakeUnique<AutofillMetrics::FormEventLogger>(
               true /* is_for_credit_card */,
               form_interactions_ukm_logger_.get())),
       has_logged_autofill_enabled_(false),
       has_logged_address_suggestions_count_(false),
@@ skipping 464 matching lines @@
   auto form_structure = base::MakeUnique<FormStructure>(form);
   form_structure->ParseFieldTypesFromAutocompleteAttributes();
   if (!form_structure->ShouldBeParsed())
     return false;
 
   // Ownership is transferred to |form_structures_| which maintains it until
   // the manager is Reset() or destroyed. It is safe to use references below
   // as long as receivers don't take ownership.
   form_structures_.push_back(std::move(form_structure));
   *parsed_form_structure = form_structures_.back().get();
-  (*parsed_form_structure)->DetermineHeuristicTypes(client_->GetUkmService());
+  (*parsed_form_structure)->DetermineHeuristicTypes(client_->GetUkmRecorder());
   return true;
 }
 
 int AutofillManager::BackendIDToInt(const std::string& backend_id) const {
   if (!base::IsValidGUID(backend_id))
     return 0;
 
   const auto found = backend_to_int_map_.find(backend_id);
   if (found == backend_to_int_map_.end()) {
     // Unknown one, make a new entry.
@@ skipping 254 matching lines @@
       fputs("Next oldest form:\n", file);
   }
   fputs("\n", file);
 
   fclose(file);
 }
 #endif  // ENABLE_FORM_DEBUG_DUMP
 
 void AutofillManager::LogCardUploadDecisions(int upload_decision_metrics) {
   AutofillMetrics::LogCardUploadDecisionMetrics(upload_decision_metrics);
-  AutofillMetrics::LogCardUploadDecisionsUkm(client_->GetUkmService(),
+  AutofillMetrics::LogCardUploadDecisionsUkm(client_->GetUkmRecorder(),
                                              pending_upload_request_url_,
                                              upload_decision_metrics);
 }
 
 }  // namespace autofill