From b310b7e1ee77f8b0f15acd8548f9bad0925d9059 Mon Sep 17 00:00:00 2001
From: Google Java Core Libraries <java-team-github-bot@google.com>
Date: Tue, 18 Jun 2024 17:32:40 -0700
Subject: [PATCH] Update Sec-Ch-UA-Form-Factor to Sec-Ch-UA-Form-Factors to
 follow latest spec.

RELNOTES=`net`: Deprecated `HttpHeaders` constant for `Sec-Ch-UA-Form-Factor` in favor of `Sec-Ch-UA-Form-Factors` to follow the latest spec.
PiperOrigin-RevId: 644563871
---
 .../src/com/google/common/net/HttpHeaders.java      | 13 ++++++++++++-
 guava/src/com/google/common/net/HttpHeaders.java    | 13 ++++++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/android/guava/src/com/google/common/net/HttpHeaders.java b/android/guava/src/com/google/common/net/HttpHeaders.java
index 1524df172644..244d6c970375 100644
--- a/android/guava/src/com/google/common/net/HttpHeaders.java
+++ b/android/guava/src/com/google/common/net/HttpHeaders.java
@@ -729,13 +729,24 @@ private ReferrerPolicyValues() {}
    * @since 31.0
    */
   public static final String SEC_CH_UA_BITNESS = "Sec-CH-UA-Bitness";
+
   /**
    * The HTTP <a href="https://wicg.github.io/ua-client-hints/#sec-ch-ua-form-factor">{@code
    * Sec-CH-UA-Form-Factor}</a> header field name.
    *
+   * @deprecated Prefer {@link SEC_CH_UA_FORM_FACTORS}.
    * @since 32.0.0
    */
-  public static final String SEC_CH_UA_FORM_FACTOR = "Sec-CH-UA-Form-Factor";
+  @Deprecated public static final String SEC_CH_UA_FORM_FACTOR = "Sec-CH-UA-Form-Factor";
+
+  /**
+   * The HTTP <a href="https://wicg.github.io/ua-client-hints/#sec-ch-ua-form-factors">{@code
+   * Sec-CH-UA-Form-Factors}</a> header field name.
+   *
+   * @since NEXT
+   */
+  public static final String SEC_CH_UA_FORM_FACTORS = "Sec-CH-UA-Form-Factors";
+
   /**
    * The HTTP <a
    * href="https://wicg.github.io/responsive-image-client-hints/#sec-ch-viewport-width">{@code
diff --git a/guava/src/com/google/common/net/HttpHeaders.java b/guava/src/com/google/common/net/HttpHeaders.java
index 1524df172644..244d6c970375 100644
--- a/guava/src/com/google/common/net/HttpHeaders.java
+++ b/guava/src/com/google/common/net/HttpHeaders.java
@@ -729,13 +729,24 @@ private ReferrerPolicyValues() {}
    * @since 31.0
    */
   public static final String SEC_CH_UA_BITNESS = "Sec-CH-UA-Bitness";
+
   /**
    * The HTTP <a href="https://wicg.github.io/ua-client-hints/#sec-ch-ua-form-factor">{@code
    * Sec-CH-UA-Form-Factor}</a> header field name.
    *
+   * @deprecated Prefer {@link SEC_CH_UA_FORM_FACTORS}.
    * @since 32.0.0
    */
-  public static final String SEC_CH_UA_FORM_FACTOR = "Sec-CH-UA-Form-Factor";
+  @Deprecated public static final String SEC_CH_UA_FORM_FACTOR = "Sec-CH-UA-Form-Factor";
+
+  /**
+   * The HTTP <a href="https://wicg.github.io/ua-client-hints/#sec-ch-ua-form-factors">{@code
+   * Sec-CH-UA-Form-Factors}</a> header field name.
+   *
+   * @since NEXT
+   */
+  public static final String SEC_CH_UA_FORM_FACTORS = "Sec-CH-UA-Form-Factors";
+
   /**
    * The HTTP <a
    * href="https://wicg.github.io/responsive-image-client-hints/#sec-ch-viewport-width">{@code