[Autofill] Add upstreaming UKM

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 72cdd8c3f5757accc172498b2d6de0e88059b979..fb4e064431c1bfe159b03980730b9c8a2d282f58 100644
--- a/components/autofill/core/browser/test_autofill_client.h
+++ b/components/autofill/core/browser/test_autofill_client.h
@@ -16,6 +16,8 @@
 #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/ukm_source.h"

[Mathieu, 2017/03/09 18:40:49]

fix

[sebsg, 2017/03/09 19:57:04]

Done.

 #include "google_apis/gaia/fake_identity_provider.h"
 #include "google_apis/gaia/fake_oauth2_token_service.h"
 
@@ -34,6 +36,7 @@ class TestAutofillClient : public AutofillClient {
   syncer::SyncService* GetSyncService() override;
   IdentityProvider* GetIdentityProvider() override;
   rappor::RapporServiceImpl* GetRapporServiceImpl() override;
+  ukm::UkmService* GetUkmService() override;
   void ShowAutofillSettings() override;
   void ShowUnmaskPrompt(const CreditCard& card,
                         UnmaskCardReason reason,
@@ -91,6 +94,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_;
   GURL form_origin_;
 
   DISALLOW_COPY_AND_ASSIGN(TestAutofillClient);