Rename X-fledge-bidding-signals-format-version

Rename X-fledge-bidding-signals-format-version to
Ad-Auction-Bidding-Signals-Format-Version

This change add support for the new name, but continues supporting the
old name, for compatibility. Renaming usages of the old header in tests
and comments will come in a follow-up CL.

(cherry picked from commit a0138c9)

Bug: 1440204
Change-Id: Ie28feaee295a189e16bf5c54a10481ae47831a78
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4558704
Reviewed-by: Russ Hamilton <behamilton@google.com>
Commit-Queue: Caleb Raitto <caraitto@chromium.org>
Cr-Original-Commit-Position: refs/heads/main@{#1148184}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4568309
Reviewed-by: Krishna Govind <govind@chromium.org>
Owners-Override: Krishna Govind <govind@chromium.org>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Reviewed-by: Caleb Raitto <caraitto@chromium.org>
Commit-Queue: Krishna Govind <govind@chromium.org>
Cr-Commit-Position: refs/branch-heads/5790@{#41}
Cr-Branched-From: 1d71a33-refs/heads/main@{#1148114}

content/services/auction_worklet/trusted_signals.cc

@@ -543,8 +543,11 @@ void TrustedSignals::HandleDownloadResultOnV8Thread(
     int format_version = 1;
     std::string format_version_string;
     if (headers &&
-        headers->GetNormalizedHeader("X-fledge-bidding-signals-format-version",
-                                     &format_version_string)) {
+        (headers->GetNormalizedHeader(
+             "Ad-Auction-Bidding-Signals-Format-Version",
+             &format_version_string) ||
+         headers->GetNormalizedHeader("X-fledge-bidding-signals-format-version",
+                                      &format_version_string))) {
       if (!base::StringToInt(format_version_string, &format_version) ||
           (format_version != 1 && format_version != 2)) {
         std::string error = base::StringPrintf(

content/services/auction_worklet/trusted_signals_unittest.cc

@@ -13,6 +13,7 @@
 #include "base/functional/bind.h"
 #include "base/memory/scoped_refptr.h"
 #include "base/run_loop.h"
+#include "base/strings/stringprintf.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/test/bind.h"
 #include "base/test/task_environment.h"
@@ -442,6 +443,20 @@ TEST_F(TrustedSignalsTest, BiddingSignalsInvalidVersion) {
       "Rejecting load of https://url.test/ due to unrecognized Format-Version "
       "header: shiny",
       error_msg_.value());
+
+  AddResponse(
+      &url_loader_factory_,
+      GURL("https://url.test/"
+           "?hostname=publisher&keys=key1&interestGroupNames=name1"),
+      kJsonMimeType, absl::nullopt, kBaseBiddingJson,
+      base::StringPrintf("%s\nAd-Auction-Bidding-Signals-Format-Version: 100",
+                         kAllowFledgeHeader));
+  EXPECT_FALSE(FetchBiddingSignals({"name1"}, {"key1"}, kHostname,
+                                   /*experiment_group_id=*/absl::nullopt));
+  EXPECT_EQ(
+      "Rejecting load of https://url.test/ due to unrecognized Format-Version "
+      "header: 100",
+      error_msg_.value());
 }
 
 TEST_F(TrustedSignalsTest, BiddingSignalsResponseNotObject) {
@@ -641,6 +656,45 @@ TEST_F(TrustedSignalsTest, BiddingSignalsOneKey) {
             *priority_vector);
 }
 
+TEST_F(TrustedSignalsTest, BiddingSignalsOneKeyNewHeaderName) {
+  AddResponse(
+      &url_loader_factory_,
+      GURL("https://url.test/"
+           "?hostname=publisher&keys=key1&interestGroupNames=name1"),
+      kJsonMimeType, absl::nullopt, kBaseBiddingJson,
+      base::StringPrintf("%s\nAd-Auction-Bidding-Signals-Format-Version: 2",
+                         kAllowFledgeHeader));
+  scoped_refptr<TrustedSignals::Result> signals =
+      FetchBiddingSignals({"name1"}, {"key1"}, kHostname,
+                          /*experiment_group_id=*/absl::nullopt);
+  ASSERT_TRUE(signals);
+  EXPECT_EQ(R"({"key1":1})", ExtractBiddingSignals(signals.get(), {"key1"}));
+  const auto* priority_vector = signals->GetPriorityVector("name1");
+  ASSERT_TRUE(priority_vector);
+  EXPECT_EQ((TrustedSignals::Result::PriorityVector{{"foo", 1}}),
+            *priority_vector);
+}
+
+TEST_F(TrustedSignalsTest, BiddingSignalsOneKeyBothOldAndNewHeaderNames) {
+  AddResponse(
+      &url_loader_factory_,
+      GURL("https://url.test/"
+           "?hostname=publisher&keys=key1&interestGroupNames=name1"),
+      kJsonMimeType, absl::nullopt, kBaseBiddingJson,
+      base::StringPrintf("%s\nAd-Auction-Bidding-Signals-Format-Version: 2\n"
+                         "X-Fledge-Bidding-Signals-Format-Version: 2",
+                         kAllowFledgeHeader));
+  scoped_refptr<TrustedSignals::Result> signals =
+      FetchBiddingSignals({"name1"}, {"key1"}, kHostname,
+                          /*experiment_group_id=*/absl::nullopt);
+  ASSERT_TRUE(signals);
+  EXPECT_EQ(R"({"key1":1})", ExtractBiddingSignals(signals.get(), {"key1"}));
+  const auto* priority_vector = signals->GetPriorityVector("name1");
+  ASSERT_TRUE(priority_vector);
+  EXPECT_EQ((TrustedSignals::Result::PriorityVector{{"foo", 1}}),
+            *priority_vector);
+}
+
 TEST_F(TrustedSignalsTest, ScoringSignalsForOneRenderUrl) {
   scoped_refptr<TrustedSignals::Result> signals =
       FetchScoringSignalsWithResponse(