Reland "Reland "Reland "[XR] Use desktop user agent client hints by default for XR devices"""

This is a reland of commit 762df81b695eb7c8a54fe11079435ece2fdd8913

Original change's description:
> Reland "Reland "[XR] Use desktop user agent client hints by default for XR devices""
>
> This is a reland of commit f007ff92a06f2fc270aafb011d22ccbfcc5a5197
>
> This reland resolves issues from the original version, specifically addressing
> performance test failures and post-submit linker errors. The tests now fetch
> device properties using device_info, ensuring successful execution.
> Key modifications include:
>
> 1. XR Device Determination: Switched from using the `device::features::IsXrDevice()` feature flag to `base::android::device_info::is_xr()` for identifying XR devices.
> 2. New Form Factor: Introduced `ui::DEVICE_FORM_FACTOR_XR` as a new enum type for form factors. It is similar to the approach used by devices of desktop form factor.
> 3. Testing: Added `for-testing` methods to the `DeviceInfo` class to enable XR device simulation in unit tests. These methods can be utilized for browser tests once XR devices are integrated into automated testing.
> 4. Code Cleanup: Removed `device::features::kForceIsXrDeviceForTesting`, a public cpp feature previously used for testing, and cleaned up associated code.
>
> Original change's description:
> > Reland "[XR] Use desktop user agent client hints by default for XR devices"
> >
> > This is a reland of commit ba8733b34194c66425f780c3a09ea2051da5c7f1
> >
> > Original change's description:
> > > [XR] Use desktop user agent client hints by default for XR devices
> > >
> > > This change modifies the user agent client hints for XR devices to align
> > > with a desktop form factor.
> > >
> > > Previously, search requests from XR devices sent the default mobile user
> > > agent, causing some web services to incorrectly identify the XR device
> > > as a mobile phone. This resulted in a degraded user experience, such as
> > > 3D models links not appearing in initial search results.
> > >
> > > The user agent for XR devices now correctly reflects the user agent
> > > string, similar to for a desktop (crrev.com/c/6639016). This is achieved
> > > by setting the platform info mobile flag and specifying device-specific
> > > details like architecture, CPU, and bit count.
> > >
> > > This change also resolves the issue of Chrome not playing videos hosted
> > > on a drive on XR devices.
> > >
> > > Test: Verified on a Moohan device by searching for "Golden Eagle". The
> > > "View in 3D" option now appears in the initial search results. A screen
> > > recording of the successful test is available at
> > > https://drive.google.com/file/d/14BcygWXpdrA7E8Ewu3ADNIbYPOo2XZ66/view?usp=drive_link&resourcekey=0-Gi2OiD2fMlYe-2UAd-4Qtw
> > >
> > > Bug: 381541583
> > > Change-Id: I45c1e2205cc0058bbc0c0f787a16cfe3841a468c
> > > Fixed: 380746545
> > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6769955
> > > Reviewed-by: Victor Tan <[email protected]>
> > > Commit-Queue: Gurmeet Kalra <[email protected]>
> > > Cr-Commit-Position: refs/heads/main@{#1491731}
> >
> > Bug: 381541583
> > Change-Id: Ie222b844db21262f26aade3d7d785bb8203cc131
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6787410
> > Reviewed-by: Victor Tan <[email protected]>
> > Commit-Queue: Gurmeet Kalra <[email protected]>
> > Cr-Commit-Position: refs/heads/main@{#1492297}
>
> Bug: 381541583
> Change-Id: Ia6028d2d204f607cc0d6acc2908db1ab89c5a379
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6807752
> Owners-Override: Andrew Grieve <[email protected]>
> Commit-Queue: Gurmeet Kalra <[email protected]>
> Reviewed-by: Andrew Grieve <[email protected]>
> Reviewed-by: Victor Tan <[email protected]>
> Reviewed-by: Alexander Cooper <[email protected]>
> Reviewed-by: Daniel Cheng <[email protected]>
> Cr-Commit-Position: refs/heads/main@{#1499390}

Bug: 381541583
Change-Id: I774aaa64892b294bc34e308bb36f8f32e3307962
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6833455
Owners-Override: Andrew Grieve <[email protected]>
Reviewed-by: Daniel Cheng <[email protected]>
Reviewed-by: Takashi Nakayama <[email protected]>
Commit-Queue: Gurmeet Kalra <[email protected]>
Reviewed-by: Andrew Grieve <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1500161}
NOKEYCHECK=True
GitOrigin-RevId: d4094e647d83c494f216c9d5eb3ea93334a7b012

Author: gurmeetk

android/device_info.cc

@@ -35,6 +35,7 @@ struct IDeviceInfo {
   bool isTv;
   // Available only on Android T+.
   int32_t vulkanDeqpLevel;
+  bool isXr;
 };
 #endif
 
@@ -64,13 +65,15 @@ static void JNI_DeviceInfo_FillFields(JNIEnv* env,
                                       jboolean isAutomotive,
                                       jboolean isFoldable,
                                       jboolean isDesktop,
-                                      jint vulkanDeqpLevel) {
+                                      jint vulkanDeqpLevel,
+                                      jboolean isXr) {
   Set(IDeviceInfo{.gmsVersionCode = gmsVersionCode,
                   .isAutomotive = static_cast<bool>(isAutomotive),
                   .isDesktop = static_cast<bool>(isDesktop),
                   .isFoldable = static_cast<bool>(isFoldable),
                   .isTv = static_cast<bool>(isTV),
-                  .vulkanDeqpLevel = vulkanDeqpLevel});
+                  .vulkanDeqpLevel = vulkanDeqpLevel,
+                  .isXr = static_cast<bool>(isXr)});
 }
 
 const std::string& gms_version_code() {
@@ -102,4 +105,17 @@ int32_t vulkan_deqp_level() {
   return get_device_info().vulkanDeqpLevel;
 }
 
+bool is_xr() {
+  return get_device_info().isXr;
+}
+
+void set_is_xr_for_testing() {
+  Java_DeviceInfo_setIsXrForTesting(AttachCurrentThread());  // IN-TEST
+  get_holder().reset();
+}
+
+void reset_is_xr_for_testing() {
+  Java_DeviceInfo_resetIsXrForTesting(AttachCurrentThread());  // IN-TEST
+  get_holder().reset();
+}
 }  // namespace base::android::device_info

android/device_info.h

@@ -32,7 +32,11 @@ BASE_EXPORT bool is_foldable();
 BASE_EXPORT bool is_desktop();
 // Available only on Android T+.
 BASE_EXPORT int32_t vulkan_deqp_level();
+BASE_EXPORT bool is_xr();
 
+// For testing use only.
+BASE_EXPORT void set_is_xr_for_testing();
+BASE_EXPORT void reset_is_xr_for_testing();
 }  // namespace base::android::device_info
 
 #endif  // BASE_ANDROID_DEVICE_INFO_H_

android/java/src/org/chromium/base/DeviceInfo.java

@@ -36,6 +36,7 @@ public final class DeviceInfo {
     private static @Nullable String sGmsVersionCodeForTesting;
     private static @Nullable Boolean sIsAutomotiveForTesting;
     private static boolean sInitialized;
+    private static boolean sIsXrForTesting;
     private final IDeviceInfo mIDeviceInfo;
 
     @GuardedBy("CREATION_LOCK")
@@ -61,7 +62,8 @@ public static void sendToNative(IDeviceInfo info) {
                         /* isAutomotive= */ info.isAutomotive,
                         /* isFoldable= */ info.isFoldable,
                         /* isDesktop= */ info.isDesktop,
-                        /* vulkanDeqpLevel= */ info.vulkanDeqpLevel);
+                        /* vulkanDeqpLevel= */ info.vulkanDeqpLevel,
+                        /* isXr= */ sIsXrForTesting ? true : info.isXr);
     }
 
     public static IDeviceInfo getAidlInfo() {
@@ -105,10 +107,24 @@ public static int getVulkanDeqpLevel() {
         return getInstance().mIDeviceInfo.vulkanDeqpLevel;
     }
 
+    public static boolean isXr() {
+        return getInstance().mIDeviceInfo.isXr;
+    }
+
     public static boolean isInitializedForTesting() {
         return sInitialized;
     }
 
+    @CalledByNativeForTesting
+    public static void setIsXrForTesting() {
+        sIsXrForTesting = true;
+    }
+
+    @CalledByNativeForTesting
+    public static void resetIsXrForTesting() {
+        sIsXrForTesting = false;
+    }
+
     private static DeviceInfo getInstance() {
         // Some tests mock out things BuildInfo is based on, so disable caching in tests to ensure
         // such mocking is not defeated by caching.
@@ -197,6 +213,8 @@ private DeviceInfo() {
             }
         }
         mIDeviceInfo.vulkanDeqpLevel = vulkanLevel;
+
+        mIDeviceInfo.isXr = pm.hasSystemFeature("android.software.xr.api.openxr");
     }
 
     @NativeMethods
@@ -207,6 +225,7 @@ void fillFields(
                 boolean isAutomotive,
                 boolean isFoldable,
                 boolean isDesktop,
-                int vulkanDeqpLevel);
+                int vulkanDeqpLevel,
+                boolean isXr);
     }
 }

android/java/src/org/chromium/base/IDeviceInfo.aidl

@@ -11,4 +11,5 @@ parcelable IDeviceInfo {
   boolean isFoldable;
   boolean isTv;
   int vulkanDeqpLevel;
+  boolean isXr;
 }