Update Sec-Ch-UA-Form-Factor to Sec-Ch-UA-Form-Factors to follow late…

…st 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
google · Jun 19, 2024 · b310b7e · b310b7e
1 parent 22151fa
commit b310b7e
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git 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
@@ -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