[Doodle] Allow overriding the API URL via a fieldtrial param

chrome/browser/about_flags.cc

 // Copyright (c) 2012 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 "chrome/browser/about_flags.h"
 
 #include <iterator>
 #include <map>
 #include <set>
 #include <utility>
@@ skipping 735 matching lines @@
     kAutofillCreditCardLastUsedDateFeatureVariationExpDate[] = {
         {"show_expiration_date", "true"}};
 
 const FeatureEntry::FeatureVariation
     kAutofillCreditCardLastUsedDateFeatureVariations[] = {
         {"Display expiration date",
          kAutofillCreditCardLastUsedDateFeatureVariationExpDate,
          arraysize(kAutofillCreditCardLastUsedDateFeatureVariationExpDate),
          nullptr}};
 
+#if defined(OS_ANDROID)
+const FeatureEntry::FeatureParam kUseNewDoodleApiTest0[] = {
+    {"doodle_override_url",
+     "https://www.gstatic.com/chrome/ntp/doodle_test/android0.json"}};
+const FeatureEntry::FeatureParam kUseNewDoodleApiTest1[] = {
+    {"doodle_override_url",
+     "https://www.gstatic.com/chrome/ntp/doodle_test/android1.json"}};
+const FeatureEntry::FeatureParam kUseNewDoodleApiTest2[] = {
+    {"doodle_override_url",
+     "https://www.gstatic.com/chrome/ntp/doodle_test/android2.json"}};
+const FeatureEntry::FeatureParam kUseNewDoodleApiTest3[] = {
+    {"doodle_override_url",
+     "https://www.gstatic.com/chrome/ntp/doodle_test/android3.json"}};
+const FeatureEntry::FeatureParam kUseNewDoodleApiTest4[] = {
+    {"doodle_override_url",
+     "https://www.gstatic.com/chrome/ntp/doodle_test/android4.json"}};
+const FeatureEntry::FeatureParam kUseNewDoodleApiTest5[] = {
+    {"doodle_override_url",
+     "https://www.gstatic.com/chrome/ntp/doodle_test/android5.json"}};
+const FeatureEntry::FeatureParam kUseNewDoodleApiTest6[] = {
+    {"doodle_override_url",
+     "https://www.gstatic.com/chrome/ntp/doodle_test/android6.json"}};
+const FeatureEntry::FeatureParam kUseNewDoodleApiTest7[] = {
+    {"doodle_override_url",
+     "https://www.gstatic.com/chrome/ntp/doodle_test/android7.json"}};
+const FeatureEntry::FeatureParam kUseNewDoodleApiTest8[] = {
+    {"doodle_override_url",
+     "https://www.gstatic.com/chrome/ntp/doodle_test/android8.json"}};
+
+const FeatureEntry::FeatureVariation kUseNewDoodleApiVariations[] = {
+    {"(force test doodle 0)", kUseNewDoodleApiTest0,
+     arraysize(kUseNewDoodleApiTest0), nullptr},
+    {"(force test doodle 1)", kUseNewDoodleApiTest1,
+     arraysize(kUseNewDoodleApiTest1), nullptr},
+    {"(force test doodle 2)", kUseNewDoodleApiTest2,
+     arraysize(kUseNewDoodleApiTest2), nullptr},
+    {"(force test doodle 3)", kUseNewDoodleApiTest3,
+     arraysize(kUseNewDoodleApiTest3), nullptr},
+    {"(force test doodle 4)", kUseNewDoodleApiTest4,
+     arraysize(kUseNewDoodleApiTest4), nullptr},
+    {"(force test doodle 5)", kUseNewDoodleApiTest5,
+     arraysize(kUseNewDoodleApiTest5), nullptr},
+    {"(force test doodle 6)", kUseNewDoodleApiTest6,
+     arraysize(kUseNewDoodleApiTest6), nullptr},
+    {"(force test doodle 7)", kUseNewDoodleApiTest7,
+     arraysize(kUseNewDoodleApiTest7), nullptr},
+    {"(force test doodle 8)", kUseNewDoodleApiTest8,
+     arraysize(kUseNewDoodleApiTest8), nullptr}};
+#endif  // OS_ANDROID
+
 const FeatureEntry::FeatureParam kDelayNavigation5SecondDelay[] = {
     {DelayNavigationThrottle::kParamDelayNavigationDurationMillis, "5000"},
     {DelayNavigationThrottle::kParamDelayNavigationProbability, "1"}};
 
 const FeatureEntry::FeatureParam kDelayNavigation5SecondDelay25Percent[] = {
     {DelayNavigationThrottle::kParamDelayNavigationDurationMillis, "5000"},
     {DelayNavigationThrottle::kParamDelayNavigationProbability, "0.25"}};
 
 const FeatureEntry::FeatureParam kDelayNavigation5SecondDelayRandomize[] = {
     {DelayNavigationThrottle::kParamDelayNavigationDurationMillis, "5000"},
@@ skipping 1729 matching lines @@
      flag_descriptions::kMojoLoadingDescription, kOsAll,
      FEATURE_VALUE_TYPE(features::kLoadingWithMojo)},
 
 #if defined(OS_CHROMEOS)
     {"force-tablet-mode", flag_descriptions::kForceTabletModeName,
      flag_descriptions::kForceTabletModeDescription, kOsCrOS,
      MULTI_VALUE_TYPE(kAshForceTabletModeChoices)},
 #endif  // OS_CHROMEOS
 
 #if defined(OS_ANDROID)
     {"use-new-doodle-api", flag_descriptions::kUseNewDoodleApiName,

[sfiera, 2017/04/05 15:22:13]

So this flag doesn't exist on Desktop, even though the new Doodle code is
intended for use there too?

[Marc Treib, 2017/04/05 15:33:59]

Eventually, but not yet.
When we start working on desktop, the flag will have to be moved. In retrospect,
it might have been better to create it in a common location in the first place.

      flag_descriptions::kUseNewDoodleApiDescription, kOsAndroid,
-     FEATURE_VALUE_TYPE(chrome::android::kUseNewDoodleApi)},
+     FEATURE_WITH_PARAMS_VALUE_TYPE(chrome::android::kUseNewDoodleApi,
+                                    kUseNewDoodleApiVariations,
+                                    "UseNewDoodleApi")},

[sfiera, 2017/04/05 15:22:13]

kUseNewDoodleApi.name?

[Marc Treib, 2017/04/05 15:33:59]

Done.

 #endif  // OS_ANDROID
 
     {"delay-navigation", flag_descriptions::kDelayNavigationName,
      flag_descriptions::kDelayNavigationDescription, kOsAll,
      FEATURE_WITH_PARAMS_VALUE_TYPE(kDelayNavigationFeature,
                                     kDelayNavigationFeatureVariations,
                                     "DelayNavigation")},
 
 #if defined(OS_ANDROID)
     {"enable-custom-context-menu",
@@ skipping 203 matching lines @@
 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
 
 const FeatureEntry* GetFeatureEntries(size_t* count) {
   *count = arraysize(kFeatureEntries);
   return kFeatureEntries;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags