Refactor UKM interface for mojo-ification

components/autofill/core/browser/form_structure.h

 // 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.
 
 #ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_FORM_STRUCTURE_H_
 #define COMPONENTS_AUTOFILL_CORE_BROWSER_FORM_STRUCTURE_H_
 
 #include <stddef.h>
 
 #include <memory>
@@ skipping 21 matching lines @@
 
 namespace base {
 class TimeTicks;
 }
 
 namespace rappor {
 class RapporServiceImpl;
 }
 
 namespace ukm {
-class UkmService;
+class UkmRecorder;
 }
 
 namespace autofill {
 
 struct FormData;
 struct FormDataPredictions;
 
 // FormStructure stores a single HTML form together with the values entered
 // in the fields along with additional information needed by Autofill.
 class FormStructure {
  public:
   explicit FormStructure(const FormData& form);
   virtual ~FormStructure();
 
   // Runs several heuristics against the form fields to determine their possible
-  // types. If |ukm_service| is specified, logs UKM for the form structure
+  // types. If |ukm_recorder| is specified, logs UKM for the form structure
   // corresponding to |source_url_|.
-  void DetermineHeuristicTypes(ukm::UkmService* ukm_service);
+  void DetermineHeuristicTypes(ukm::UkmRecorder* ukm_recorder);
 
   // Encodes the proto |upload| request from this FormStructure.
   // In some cases, a |login_form_signature| is included as part of the upload.
   // This field is empty when sending upload requests for non-login forms.
   bool EncodeUploadRequest(const ServerFieldTypeSet& available_field_types,
                            bool form_was_autofilled,
                            const std::string& login_form_signature,
                            bool observed_submission,
                            autofill::AutofillUploadContents* upload) const;
 
@@ skipping 271 matching lines @@
   // The unique signature for this form, composed of the target url domain,
   // the form name, and the form field names in a 64-bit hash.
   FormSignature form_signature_;
 
   DISALLOW_COPY_AND_ASSIGN(FormStructure);
 };
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_FORM_STRUCTURE_H_