Change variations service domain for Android Chrome.

The new domain is clientservices.googleapis.com.

Also, removes testing config for VarationsServiceControl
30m interval trial, since that's the client default.
Updates the parameter code for the fetch interval to fix
the typo in the trial name.

Note: Should not be submitted until we verify that the new
URL is working.

BUG=635680

Review-Url: https://codereview.chromium.org/2223263002
Cr-Commit-Position: refs/heads/master@{#415750}

components/variations/variations_request_scheduler.cc

@@ -47,7 +47,7 @@ void VariationsRequestScheduler::OnAppEnterForeground() {
 base::TimeDelta VariationsRequestScheduler::GetFetchPeriod() const {
   // The fetch interval can be overridden by a variation param.
   std::string period_min_str =
-      variations::GetVariationParamValue("VarationsServiceControl",
+      variations::GetVariationParamValue("VariationsServiceControl",
                                          "fetch_period_min");
   size_t period_min;
   if (base::StringToSizeT(period_min_str, &period_min))

components/variations/variations_url_constants.cc

@@ -7,7 +7,12 @@
 namespace variations {
 
 // Default server of Variations seed info.
+#if defined(OS_ANDROID)
+const char kDefaultServerUrl[] =
+    "https://clientservices.googleapis.com/chrome-variations/seed";
+#else
 const char kDefaultServerUrl[] =
     "https://clients4.google.com/chrome-variations/seed";
+#endif
 
 }  // namespace variations

testing/variations/fieldtrial_testing_config_android.json

@@ -568,14 +568,6 @@
             "group_name": "aggressive"
         }
     ],
-    "VarationsServiceControl": [
-        {
-            "group_name": "Interval_30min",
-            "params": {
-                "fetch_period_min": "30"
-            }
-        }
-    ],
     "WebFontsInterventionV2": [
         {
             "group_name": "Enabled-slow2g"

testing/variations/fieldtrial_testing_config_chromeos.json

@@ -335,14 +335,6 @@
             "group_name": "aggressive"
         }
     ],
-    "VarationsServiceControl": [
-        {
-            "group_name": "Interval_30min",
-            "params": {
-                "fetch_period_min": "30"
-            }
-        }
-    ],
     "WebFontsInterventionV2": [
         {
             "group_name": "Enabled-slow2g"

testing/variations/fieldtrial_testing_config_ios.json

@@ -92,13 +92,5 @@
         {
             "group_name": "Enabled"
         }
-    ],
-    "VarationsServiceControl": [
-        {
-            "group_name": "Interval_30min",
-            "params": {
-                "fetch_period_min": "30"
-            }
-        }
     ]
 }

testing/variations/fieldtrial_testing_config_linux.json

@@ -397,14 +397,6 @@
             "group_name": "aggressive"
         }
     ],
-    "VarationsServiceControl": [
-        {
-            "group_name": "Interval_30min",
-            "params": {
-                "fetch_period_min": "30"
-            }
-        }
-    ],
     "WebFontsInterventionV2": [
         {
             "group_name": "Enabled-slow2g"

testing/variations/fieldtrial_testing_config_mac.json

@@ -441,14 +441,6 @@
             "group_name": "aggressive"
         }
     ],
-    "VarationsServiceControl": [
-        {
-            "group_name": "Interval_30min",
-            "params": {
-                "fetch_period_min": "30"
-            }
-        }
-    ],
     "ViewsSimplifiedFullscreenUI": [
         {
             "enable_features": [

testing/variations/fieldtrial_testing_config_win.json

@@ -501,14 +501,6 @@
             "group_name": "aggressive"
         }
     ],
-    "VarationsServiceControl": [
-        {
-            "group_name": "Interval_30min",
-            "params": {
-                "fetch_period_min": "30"
-            }
-        }
-    ],
     "WebFontsInterventionV2": [
         {
             "group_name": "Enabled-slow2g"