Enabled Variations and Finch retry over HTTP by default on trunk.

Enabled on trunk since the UMA-over-HTTP experiment will now
be ramped to enabled at 1% on stable, and Variations-over-HTTP will
be set to disabled at 1% on all channels. Also added a testing config
for VariationsHttpDisabled.

Bug: 766233
Change-Id: Ie19f57ef7b5535d389d05e277652ff888818d006
Reviewed-on: https://chromium-review.googlesource.com/990086Reviewed-by: Steven Holte <holte@chromium.org>
Commit-Queue: Carlos IL <carlosil@chromium.org>
Cr-Commit-Position: refs/heads/master@{#547530}

components/metrics/net/net_metrics_log_uploader.cc

@@ -20,7 +20,7 @@
 namespace {
 
 const base::Feature kHttpRetryFeature{"UMAHttpRetry",
-                                      base::FEATURE_DISABLED_BY_DEFAULT};
+                                      base::FEATURE_ENABLED_BY_DEFAULT};
 
 // Constants used for encrypting logs that are sent over HTTP. The
 // corresponding private key is used by the metrics server to decrypt logs.

components/variations/service/variations_service.cc

@@ -59,7 +59,7 @@ namespace variations {
 namespace {
 
 const base::Feature kHttpRetryFeature{"VariationsHttpRetry",
-                                      base::FEATURE_DISABLED_BY_DEFAULT};
+                                      base::FEATURE_ENABLED_BY_DEFAULT};
 
 // Constants used for encrypting the if-none-match header if we are retrieving a
 // seed over http.

testing/variations/fieldtrial_testing_config.json

@@ -4103,6 +4103,26 @@
             ]
         }
     ],
+    "VariationsHttpDisabled": [
+        {
+            "platforms": [
+                "win",
+                "mac",
+                "chromeos",
+                "linux",
+                "ios",
+                "android"
+            ],
+            "experiments": [
+                {
+                    "name": "VariationsHttpDisabled",
+                    "disable_features": [
+                        "VariationsHTTPRetry"
+                    ]
+                }
+            ]
+        }
+    ],
     "VideoCaptureService": [
         {
             "platforms": [