Reland - [Autofill] Enable Autofill UKM by default.

components/payments/core/journey_logger_unittest.cc

 // Copyright 2017 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/payments/core/journey_logger.h"
 
 #include "base/metrics/metrics_hashes.h"
 #include "base/test/histogram_tester.h"
 #include "base/test/scoped_feature_list.h"
-#include "components/autofill/core/browser/autofill_experiments.h"
 #include "components/metrics/proto/ukm/entry.pb.h"
 #include "components/ukm/test_ukm_service.h"
 #include "components/ukm/ukm_entry.h"
 #include "components/ukm/ukm_source.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using testing::ContainerEq;
 
 namespace payments {
@@ skipping 675 matching lines @@
   histogram_tester.ExpectBucketCount("PaymentRequest.CanMakePayment.Usage",
                                      JourneyLogger::CAN_MAKE_PAYMENT_NOT_USED,
                                      1);
   histogram_tester.ExpectBucketCount(
       "PaymentRequest.CanMakePayment.NotUsed.WithShowEffectOnCompletion",
       JourneyLogger::COMPLETION_STATUS_USER_ABORTED, 1);
 }
 
 // Tests that the Payment Request UKMs are logged correctly.
 TEST(JourneyLoggerTest, RecordJourneyStatsHistograms_CheckoutFunnelUkm) {
-  base::test::ScopedFeatureList scoped_feature_list_;
-  scoped_feature_list_.InitAndEnableFeature(autofill::kAutofillUkmLogging);
-
   ukm::UkmServiceTestingHarness ukm_service_test_harness;
   ukm::TestUkmService* ukm_service =
       ukm_service_test_harness.test_ukm_service();
   char test_url[] = "http://www.google.com/";
 
   base::HistogramTester histogram_tester;
   JourneyLogger logger(/*is_incognito=*/true, /*url=*/GURL(test_url),
                        /*ukm_service=*/ukm_service);
 
   // Simulate that the user aborts after being shown the Payment Request and
@@ skipping 25 matching lines @@
             status_metric->value());
 
   const ukm::Entry_Metric* step_metric =
       FindMetric(internal::kUKMEventsMetricName, entry_proto.metrics());
   ASSERT_NE(nullptr, step_metric);
   EXPECT_EQ(JourneyLogger::EVENT_SHOWN | JourneyLogger::EVENT_PAY_CLICKED,
             step_metric->value());
 }
 
 }  // namespace payments