Enable OptimizationGuideKeyedService by default

Bug: 969558
Change-Id: I8e2f766a02b53c5730dc09696f74e7a9b37e2552
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1907205Reviewed-by: Tarun Bansal <tbansal@chromium.org>
Reviewed-by: Doug Arnett <dougarnett@chromium.org>
Reviewed-by: Robert Kaplow <rkaplow@chromium.org>
Commit-Queue: Sophie Chang <sophiechang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#715706}

components/optimization_guide/optimization_guide_features.cc

@@ -57,7 +57,13 @@ const base::Feature kOptimizationHintsFetchingAnonymousDataConsent{
 
 // Enables the initialization of the Optimization Guide Keyed Service.
 const base::Feature kOptimizationGuideKeyedService{
-    "OptimizationGuideKeyedService", base::FEATURE_DISABLED_BY_DEFAULT};
+  "OptimizationGuideKeyedService",
+#if defined(OS_ANDROID)
+      base::FEATURE_ENABLED_BY_DEFAULT
+#else   // !defined(OS_ANDROID)
+      base::FEATURE_DISABLED_BY_DEFAULT
+#endif  // defined(OS_ANDROID)
+};
 
 // Enables the prediction of optimization targets.
 const base::Feature kOptimizationTargetPrediction{

testing/variations/fieldtrial_testing_config.json

@@ -4125,21 +4125,6 @@
             ]
         }
     ],
-    "OptimizationGuideKeyedService": [
-        {
-            "platforms": [
-                "android"
-            ],
-            "experiments": [
-                {
-                    "name": "Enabled_20190904",
-                    "enable_features": [
-                        "OptimizationGuideKeyedService"
-                    ]
-                }
-            ]
-        }
-    ],
     "OutOfBlinkCors": [
         {
             "platforms": [