Refactor UKM interface for mojo-ification

components/autofill/core/browser/test_autofill_client.h

Index: components/autofill/core/browser/test_autofill_client.h
diff --git a/components/autofill/core/browser/test_autofill_client.h b/components/autofill/core/browser/test_autofill_client.h
index a140c7726652d260774d4c197f2643fd40056384..3abcdec17b0982afac8336b52d1edf9fd587827c 100644
--- a/components/autofill/core/browser/test_autofill_client.h
+++ b/components/autofill/core/browser/test_autofill_client.h
@@ -16,7 +16,7 @@
 #include "components/autofill/core/browser/autofill_client.h"
 #include "components/prefs/pref_service.h"
 #include "components/rappor/test_rappor_service.h"
-#include "components/ukm/test_ukm_service.h"
+#include "components/ukm/test_ukm_recorder.h"
 #include "google_apis/gaia/fake_identity_provider.h"
 #include "google_apis/gaia/fake_oauth2_token_service.h"
 
@@ -35,7 +35,7 @@ class TestAutofillClient : public AutofillClient {
   syncer::SyncService* GetSyncService() override;
   IdentityProvider* GetIdentityProvider() override;
   rappor::RapporServiceImpl* GetRapporServiceImpl() override;
-  ukm::UkmService* GetUkmService() override;
+  ukm::UkmRecorder* GetUkmRecorder() override;
   SaveCardBubbleController* GetSaveCardBubbleController() override;
   void ShowAutofillSettings() override;
   void ShowUnmaskPrompt(const CreditCard& card,
@@ -88,9 +88,7 @@ class TestAutofillClient : public AutofillClient {
 
   void set_form_origin(const GURL& url) { form_origin_ = url; }
 
-  ukm::TestUkmService* GetTestUkmService() {
-    return ukm_service_test_harness_.test_ukm_service();
-  }
+  ukm::TestUkmRecorder* GetTestUkmRecorder() { return &test_ukm_recorder_; }
 
  private:
   // NULL by default.
@@ -98,7 +96,7 @@ class TestAutofillClient : public AutofillClient {
   std::unique_ptr<FakeOAuth2TokenService> token_service_;
   std::unique_ptr<FakeIdentityProvider> identity_provider_;
   std::unique_ptr<rappor::TestRapporServiceImpl> rappor_service_;
-  ukm::UkmServiceTestingHarness ukm_service_test_harness_;
+  ukm::TestUkmRecorder test_ukm_recorder_;
 #if !defined(OS_ANDROID)
   std::unique_ptr<SaveCardBubbleController> save_card_bubble_controller_;
 #endif