SearchProviderLogos: Add about:flags options for fixed test doodles

Bug: 690467
Change-Id: Icd90a52d66d7d6b8734398de6707f18e762cd06b
Reviewed-on: https://chromium-review.googlesource.com/600309Reviewed-by: Bernhard Bauer <bauerb@chromium.org>
Commit-Queue: Marc Treib <treib@chromium.org>
Cr-Commit-Position: refs/heads/master@{#491964}

chrome/browser/about_flags.cc

@@ -1126,6 +1126,31 @@ const FeatureEntry::Choice kAsyncImageDecodingChoices[] = {
      cc::switches::kDisableCheckerImaging, ""},
 };
 
+#if defined(OS_ANDROID)
+const FeatureEntry::FeatureParam kUseDdljsonApiTest1[] = {
+    {search_provider_logos::features::kDdljsonOverrideUrlParam,
+     "https://www.gstatic.com/chrome/ntp/doodle_test/ddljson_android1.json"}};
+const FeatureEntry::FeatureParam kUseDdljsonApiTest2[] = {
+    {search_provider_logos::features::kDdljsonOverrideUrlParam,
+     "https://www.gstatic.com/chrome/ntp/doodle_test/ddljson_android2.json"}};
+const FeatureEntry::FeatureParam kUseDdljsonApiTest3[] = {
+    {search_provider_logos::features::kDdljsonOverrideUrlParam,
+     "https://www.gstatic.com/chrome/ntp/doodle_test/ddljson_android3.json"}};
+const FeatureEntry::FeatureParam kUseDdljsonApiTest4[] = {
+    {search_provider_logos::features::kDdljsonOverrideUrlParam,
+     "https://www.gstatic.com/chrome/ntp/doodle_test/ddljson_android4.json"}};
+
+const FeatureEntry::FeatureVariation kUseDdljsonApiVariations[] = {
+    {"(force test doodle 1)", kUseDdljsonApiTest1,
+     arraysize(kUseDdljsonApiTest1), nullptr},
+    {"(force test doodle 2)", kUseDdljsonApiTest2,
+     arraysize(kUseDdljsonApiTest2), nullptr},
+    {"(force test doodle 3)", kUseDdljsonApiTest3,
+     arraysize(kUseDdljsonApiTest3), nullptr},
+    {"(force test doodle 4)", kUseDdljsonApiTest4,
+     arraysize(kUseDdljsonApiTest4), nullptr}};
+#endif  // OS_ANDROID
+
 // RECORDING USER METRICS FOR FLAGS:
 // -----------------------------------------------------------------------------
 // The first line of the entry is the internal name.
@@ -3203,7 +3228,10 @@ const FeatureEntry kFeatureEntries[] = {
 #if defined(OS_ANDROID)
     {"use-ddljson-api", flag_descriptions::kUseDdljsonApiName,
      flag_descriptions::kUseDdljsonApiDescription, kOsAndroid,
-     FEATURE_VALUE_TYPE(search_provider_logos::features::kUseDdljsonApi)},
+     FEATURE_WITH_PARAMS_VALUE_TYPE(
+         search_provider_logos::features::kUseDdljsonApi,
+         kUseDdljsonApiVariations,
+         search_provider_logos::features::kUseDdljsonApi.name)},
 #endif  // defined(OS_ANDROID)
 
 #if defined(OS_ANDROID)

components/search_provider_logos/features.cc

@@ -10,5 +10,7 @@ namespace features {
 const base::Feature kUseDdljsonApi{"UseDdljsonApi",
                                    base::FEATURE_DISABLED_BY_DEFAULT};
 
+const char kDdljsonOverrideUrlParam[] = "ddljson-override-url";
+
 }  // namespace features
 }  // namespace search_provider_logos

components/search_provider_logos/features.h

@@ -10,8 +10,14 @@
 namespace search_provider_logos {
 namespace features {
 
+// If enabled, Google Doodles are fetched from the newer /ddljson API instead of
+// the /newtab_mobile API.
 extern const base::Feature kUseDdljsonApi;
 
+// This parameter can be used to override the URL of the /ddljson API. Useful
+// for testing.
+extern const char kDdljsonOverrideUrlParam[];
+
 }  // namespace features
 }  // namespace search_provider_logos
 

components/search_provider_logos/google_logo_api.cc

@@ -16,6 +16,7 @@
 #include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/ref_counted_memory.h"
+#include "base/metrics/field_trial_params.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
@@ -25,6 +26,11 @@
 namespace search_provider_logos {
 
 GURL GetGoogleDoodleURL(const GURL& google_base_url) {
+  std::string override_url = base::GetFieldTrialParamValueByFeature(
+      features::kUseDdljsonApi, features::kDdljsonOverrideUrlParam);
+  if (!override_url.empty()) {
+    return GURL(override_url);
+  }
   GURL::Replacements replacements;
   replacements.SetPathStr(base::FeatureList::IsEnabled(features::kUseDdljsonApi)
                               ? "async/ddljson"