Enable demographics features by default on iOS.

Also cleans up the relevant code in the fieldtrial testing config.

Bug: 978849, 1006806
Change-Id: Iecd7f06dd245dbbe9bfca17523b3ebafbc98d372
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2154527
Commit-Queue: Caitlin Fischer <caitlinfischer@google.com>
Reviewed-by: Alexei Svitkine <asvitkine@chromium.org>
Cr-Commit-Position: refs/heads/master@{#760164}

components/metrics/demographic_metrics_provider.cc

@@ -7,26 +7,15 @@
 #include "base/feature_list.h"
 #include "base/metrics/histogram_functions.h"
 #include "base/optional.h"
-#include "build/build_config.h"
 #include "components/sync/base/sync_prefs.h"
 #include "components/sync/driver/sync_service.h"
 #include "third_party/metrics_proto/ukm/report.pb.h"
 
 namespace metrics {
 
-// Enable the reporting of the user noised birth year gender in UMA by default
-// for the platforms that have browser testing.
-namespace {
-#if defined(OS_IOS)
-constexpr auto default_feature_state = base::FEATURE_DISABLED_BY_DEFAULT;
-#else
-constexpr auto default_feature_state = base::FEATURE_ENABLED_BY_DEFAULT;
-#endif
-}  // namespace
-
 // static
 const base::Feature DemographicMetricsProvider::kDemographicMetricsReporting = {
-    "DemographicMetricsReporting", default_feature_state};
+    "DemographicMetricsReporting", base::FEATURE_ENABLED_BY_DEFAULT};
 
 DemographicMetricsProvider::DemographicMetricsProvider(
     std::unique_ptr<ProfileClient> profile_client,

components/metrics/demographic_metrics_provider_unittest.cc

@@ -74,11 +74,6 @@ std::unique_ptr<TestProfileClient> MakeTestProfileClient(
 
 TEST(DemographicMetricsProviderTest,
      ProvideSyncedUserNoisedBirthYearAndGender_FeatureEnabled) {
-  // Enable demographics reporting feature.
-  base::test::ScopedFeatureList local_feature;
-  local_feature.InitAndEnableFeature(
-      DemographicMetricsProvider::kDemographicMetricsReporting);
-
   base::HistogramTester histogram;
 
   // Run demographics provider.
@@ -102,11 +97,6 @@ TEST(DemographicMetricsProviderTest,
 
 TEST(DemographicMetricsProviderTest,
      ProvideSyncedUserNoisedBirthYearAndGender_NoSyncService) {
-  // Enable demographics reporting feature.
-  base::test::ScopedFeatureList local_feature;
-  local_feature.InitAndEnableFeature(
-      DemographicMetricsProvider::kDemographicMetricsReporting);
-
   base::HistogramTester histogram;
 
   // Run demographics provider.
@@ -155,11 +145,6 @@ TEST(DemographicMetricsProviderTest,
 
 TEST(DemographicMetricsProviderTest,
      ProvideSyncedUserNoisedBirthYearAndGender_NotExactlyOneProfile) {
-  // Enable demographics reporting feature.
-  base::test::ScopedFeatureList local_feature;
-  local_feature.InitAndEnableFeature(
-      DemographicMetricsProvider::kDemographicMetricsReporting);
-
   base::HistogramTester histogram;
 
   // Run demographics provider with not exactly one Profile on disk.
@@ -182,11 +167,6 @@ TEST(DemographicMetricsProviderTest,
 
 TEST(DemographicMetricsProviderTest,
      ProvideSyncedUserNoisedBirthYearAndGender_NoUserDemographics) {
-  // Enable demographics reporting feature.
-  base::test::ScopedFeatureList local_feature;
-  local_feature.InitAndEnableFeature(
-      DemographicMetricsProvider::kDemographicMetricsReporting);
-
   base::HistogramTester histogram;
 
   // Run demographics provider with a ProfileClient that does not provide
@@ -214,11 +194,6 @@ TEST(DemographicMetricsProviderTest,
 
 TEST(DemographicMetricsProviderTest,
      ProvideSyncedUserNoisedBirthYearAndGenderToReport) {
-  // Enable demographics reporting feature.
-  base::test::ScopedFeatureList local_feature;
-  local_feature.InitAndEnableFeature(
-      DemographicMetricsProvider::kDemographicMetricsReporting);
-
   base::HistogramTester histogram;
 
   // Run demographics provider.
@@ -241,4 +216,4 @@ TEST(DemographicMetricsProviderTest,
 }
 
 }  // namespace
-}  // namespace metrics
\ No newline at end of file
+}  // namespace metrics

components/ukm/ukm_service.cc

@@ -17,7 +17,6 @@
 #include "base/rand_util.h"
 #include "base/threading/sequenced_task_runner_handle.h"
 #include "base/time/time.h"
-#include "build/build_config.h"
 #include "components/metrics/metrics_log.h"
 #include "components/metrics/metrics_service_client.h"
 #include "components/metrics/ukm_demographic_metrics_provider.h"
@@ -165,22 +164,11 @@ void PurgeExtensionDataFromUnsentLogStore(
   }
 }
 
-// Enable the reporting of the user noised birth year gender by default in UKM
-// for the platforms that have browser testing.
-#if defined(OS_IOS)
-constexpr auto kReportUserNoisedUserBirthYearAndGenderDefaultState =
-    base::FEATURE_DISABLED_BY_DEFAULT;
-#else
-constexpr auto kReportUserNoisedUserBirthYearAndGenderDefaultState =
-    base::FEATURE_ENABLED_BY_DEFAULT;
-#endif
-
 }  // namespace
 
 // static
 const base::Feature UkmService::kReportUserNoisedUserBirthYearAndGender = {
-    "UkmReportNoisedUserBirthYearAndGender",
-    kReportUserNoisedUserBirthYearAndGenderDefaultState};
+    "UkmReportNoisedUserBirthYearAndGender", base::FEATURE_ENABLED_BY_DEFAULT};
 
 UkmService::UkmService(PrefService* pref_service,
                        metrics::MetricsServiceClient* client,

components/ukm/ukm_service_unittest.cc

@@ -20,7 +20,6 @@
 #include "base/threading/platform_thread.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/time/time.h"
-#include "build/build_config.h"
 #include "components/metrics/metrics_log_uploader.h"
 #include "components/metrics/test/test_metrics_provider.h"
 #include "components/metrics/test/test_metrics_service_client.h"
@@ -425,11 +424,6 @@ TEST_F(UkmServiceTest, MetricsProviderTest) {
 
 TEST_F(UkmServiceTest, AddUserDemograhicsWhenAvailableAndFeatureEnabled) {
   ScopedUkmFeatureParams params({{"WhitelistEntries", Entry1And2Whitelist()}});
-#if defined(OS_IOS)
-  base::test::ScopedFeatureList local_feature;
-  local_feature.InitAndEnableFeature(
-      UkmService::kReportUserNoisedUserBirthYearAndGender);
-#endif
 
   int number_of_invocations = 0;
   int test_birth_year = 1983;
@@ -485,11 +479,6 @@ TEST_F(UkmServiceTest, AddUserDemograhicsWhenAvailableAndFeatureEnabled) {
 TEST_F(UkmServiceTest,
        DontAddUserDemograhicsWhenNotAvailableAndFeatureEnabled) {
   ScopedUkmFeatureParams params({{"WhitelistEntries", Entry1And2Whitelist()}});
-#if defined(OS_IOS)
-  base::test::ScopedFeatureList local_feature;
-  local_feature.InitAndEnableFeature(
-      UkmService::kReportUserNoisedUserBirthYearAndGender);
-#endif
 
   auto provider = std::make_unique<MockDemographicMetricsProvider>();
   EXPECT_CALL(*provider,
@@ -521,11 +510,9 @@ TEST_F(UkmServiceTest,
 
 TEST_F(UkmServiceTest, DontAddUserDemograhicsWhenFeatureDisabled) {
   ScopedUkmFeatureParams params({{"WhitelistEntries", Entry1And2Whitelist()}});
-#if !defined(OS_IOS)
   base::test::ScopedFeatureList local_feature;
   local_feature.InitAndDisableFeature(
       UkmService::kReportUserNoisedUserBirthYearAndGender);
-#endif
 
   // The demographics provider should not be called.
   auto provider = std::make_unique<MockDemographicMetricsProvider>();

testing/variations/fieldtrial_testing_config.json

@@ -6063,24 +6063,6 @@
             ]
         }
     ],
-    "UmaAndUkmDemographics": [
-        {
-            "platforms": [
-                "ios"
-            ],
-            "experiments": [
-                {
-                    "name": "UMA_Enabled_202002",
-                    "enable_features": [
-                        "DemographicMetricsReporting"
-                    ],
-                    "disable_features": [
-                        "UkmReportNoisedUserBirthYearAndGender"
-                    ]
-                }
-            ]
-        }
-    ],
     "UnidoOnSignInV2": [
         {
             "platforms": [