[Desktop] Enable desktop flag for desktop tests running on tablet bots

Pass force-android-desktop to tablet bots with desktop build.

Rename force-desktop-android to force-android-desktop.

Bug: 417994927
Change-Id: Ia26b60fb2d414e65d70fe5139bd7e07b68bed214
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6556609
Reviewed-by: Lei Zhang <thestig@chromium.org>
Reviewed-by: Haiyang Pan <hypan@google.com>
Commit-Queue: Sirisha Kavuluru <skavuluru@google.com>
Cr-Commit-Position: refs/heads/main@{#1462488}

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

@@ -178,7 +178,7 @@ public final class DeviceInfo {
 
         mIsDesktop =
                 pm.hasSystemFeature(PackageManager.FEATURE_PC)
-                        || CommandLine.getInstance().hasSwitch(BaseSwitches.FORCE_DESKTOP_ANDROID);
+                        || CommandLine.getInstance().hasSwitch(BaseSwitches.FORCE_ANDROID_DESKTOP);
 
         int vulkanLevel = 0;
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {

base/base_switches.cc

@@ -165,7 +165,7 @@ const char kEnableIdleTracing[] = "enable-idle-tracing";
 
 // Forces the DeviceInfo.isDesktop() check to return true. Can be used to enable
 // desktop-only features on other form factors.
-const char kForceDesktopAndroid[] = "force-desktop-android";
+const char kForceAndroidDesktop[] = "force-android-desktop";
 
 // When we retrieve the package name within the SDK Runtime, we need to use
 // a bit of a hack to do this by taking advantage of the fact that the pid

base/base_switches.h

@@ -53,7 +53,7 @@ extern const char kEnableCrashReporterForTesting[];
 extern const char kAndroidSkipChildServiceInitForTesting[];
 extern const char kDefaultCountryCodeAtInstall[];
 extern const char kEnableIdleTracing[];
-extern const char kForceDesktopAndroid[];
+extern const char kForceAndroidDesktop[];
 extern const char kHostPackageName[];
 extern const char kHostPackageLabel[];
 extern const char kHostVersionCode[];

infra/config/generated/builders/ci/android-desktop-x64-compile-rel/targets/chromium.android.desktop.json

@@ -9,6 +9,7 @@
       {
         "args": [
           "--avd-config=../../tools/android/avd/proto/android_35_google_apis_tablet_x64_tablet_landscape.textpb",
+          "--force-android-desktop",
           "--test-launcher-filter-file=../../testing/buildbot/filters/android.desktop.emulator_15.android_browsertests.filter",
           "--emulator-debug-tags=all",
           "--gs-results-bucket=chromium-result-details",
@@ -59,6 +60,7 @@
         "args": [
           "--git-revision=${got_revision}",
           "--avd-config=../../tools/android/avd/proto/android_35_google_apis_tablet_x64_tablet_landscape.textpb",
+          "--force-android-desktop",
           "--gtest_filter=-org.chromium.chrome.browser.ui.appmenu.AppMenuTest.testShowAppMenu_AnchorTop",
           "--gs-results-bucket=chromium-result-details",
           "--recover-devices"
@@ -113,6 +115,7 @@
       {
         "args": [
           "--avd-config=../../tools/android/avd/proto/android_35_google_apis_tablet_x64_tablet_landscape.textpb",
+          "--force-android-desktop",
           "--gs-results-bucket=chromium-result-details",
           "--recover-devices"
         ],
@@ -159,6 +162,7 @@
       {
         "args": [
           "--avd-config=../../tools/android/avd/proto/android_35_google_apis_tablet_x64_tablet_landscape.textpb",
+          "--force-android-desktop",
           "--test-launcher-filter-file=../../testing/buildbot/filters/android.desktop.emulator_15.unit_tests.filter",
           "--gs-results-bucket=chromium-result-details",
           "--recover-devices"

infra/config/generated/builders/ci/android-desktop-x64-rel-15-tests/targets/chromium.android.desktop.json

@@ -4,6 +4,7 @@
       {
         "args": [
           "--avd-config=../../tools/android/avd/proto/android_35_google_apis_tablet_x64_tablet_landscape.textpb",
+          "--force-android-desktop",
           "--test-launcher-filter-file=../../testing/buildbot/filters/android.desktop.emulator_15.android_browsertests.filter",
           "--emulator-debug-tags=all",
           "--gs-results-bucket=chromium-result-details",
@@ -54,6 +55,7 @@
         "args": [
           "--git-revision=${got_revision}",
           "--avd-config=../../tools/android/avd/proto/android_35_google_apis_tablet_x64_tablet_landscape.textpb",
+          "--force-android-desktop",
           "--gtest_filter=-org.chromium.chrome.browser.ui.appmenu.AppMenuTest.testShowAppMenu_AnchorTop",
           "--gs-results-bucket=chromium-result-details",
           "--recover-devices"
@@ -108,6 +110,7 @@
       {
         "args": [
           "--avd-config=../../tools/android/avd/proto/android_35_google_apis_tablet_x64_tablet_landscape.textpb",
+          "--force-android-desktop",
           "--gs-results-bucket=chromium-result-details",
           "--recover-devices"
         ],
@@ -154,6 +157,7 @@
       {
         "args": [
           "--avd-config=../../tools/android/avd/proto/android_35_google_apis_tablet_x64_tablet_landscape.textpb",
+          "--force-android-desktop",
           "--test-launcher-filter-file=../../testing/buildbot/filters/android.desktop.emulator_15.unit_tests.filter",
           "--gs-results-bucket=chromium-result-details",
           "--recover-devices"

infra/config/generated/builders/try/android-desktop-15-x64-rel/targets/chromium.android.desktop.json

@@ -9,6 +9,7 @@
       {
         "args": [
           "--avd-config=../../tools/android/avd/proto/android_35_google_apis_tablet_x64_tablet_landscape.textpb",
+          "--force-android-desktop",
           "--test-launcher-filter-file=../../testing/buildbot/filters/android.desktop.emulator_15.android_browsertests.filter",
           "--emulator-debug-tags=all",
           "--gs-results-bucket=chromium-result-details",
@@ -59,6 +60,7 @@
         "args": [
           "--git-revision=${got_revision}",
           "--avd-config=../../tools/android/avd/proto/android_35_google_apis_tablet_x64_tablet_landscape.textpb",
+          "--force-android-desktop",
           "--gtest_filter=-org.chromium.chrome.browser.ui.appmenu.AppMenuTest.testShowAppMenu_AnchorTop",
           "--gs-results-bucket=chromium-result-details",
           "--recover-devices"
@@ -113,6 +115,7 @@
       {
         "args": [
           "--avd-config=../../tools/android/avd/proto/android_35_google_apis_tablet_x64_tablet_landscape.textpb",
+          "--force-android-desktop",
           "--gs-results-bucket=chromium-result-details",
           "--recover-devices"
         ],
@@ -159,6 +162,7 @@
       {
         "args": [
           "--avd-config=../../tools/android/avd/proto/android_35_google_apis_tablet_x64_tablet_landscape.textpb",
+          "--force-android-desktop",
           "--test-launcher-filter-file=../../testing/buildbot/filters/android.desktop.emulator_15.unit_tests.filter",
           "--gs-results-bucket=chromium-result-details",
           "--recover-devices"

infra/config/generated/builders/try/android-desktop-x64-rel/targets/chromium.android.desktop.json

@@ -9,6 +9,7 @@
       {
         "args": [
           "--avd-config=../../tools/android/avd/proto/android_35_google_apis_tablet_x64_tablet_landscape.textpb",
+          "--force-android-desktop",
           "--test-launcher-filter-file=../../testing/buildbot/filters/android.desktop.emulator_15.android_browsertests.filter",
           "--emulator-debug-tags=all",
           "--gs-results-bucket=chromium-result-details",
@@ -59,6 +60,7 @@
         "args": [
           "--git-revision=${got_revision}",
           "--avd-config=../../tools/android/avd/proto/android_35_google_apis_tablet_x64_tablet_landscape.textpb",
+          "--force-android-desktop",
           "--gtest_filter=-org.chromium.chrome.browser.ui.appmenu.AppMenuTest.testShowAppMenu_AnchorTop",
           "--gs-results-bucket=chromium-result-details",
           "--recover-devices"
@@ -113,6 +115,7 @@
       {
         "args": [
           "--avd-config=../../tools/android/avd/proto/android_35_google_apis_tablet_x64_tablet_landscape.textpb",
+          "--force-android-desktop",
           "--gs-results-bucket=chromium-result-details",
           "--recover-devices"
         ],
@@ -159,6 +162,7 @@
       {
         "args": [
           "--avd-config=../../tools/android/avd/proto/android_35_google_apis_tablet_x64_tablet_landscape.textpb",
+          "--force-android-desktop",
           "--test-launcher-filter-file=../../testing/buildbot/filters/android.desktop.emulator_15.unit_tests.filter",
           "--gs-results-bucket=chromium-result-details",
           "--recover-devices"

infra/config/subprojects/chromium/ci/chromium.android.desktop.star

@@ -264,6 +264,7 @@ ci.thin_tester(
                 mixins = [
                     "15-desktop-x64-emulator",
                     "emulator-8-cores",
+                    "force-android-desktop",
                 ],
             ),
         ],

infra/config/targets/mixins.star

@@ -751,6 +751,14 @@ targets.mixin(
     ),
 )
 
+targets.mixin(
+    name = "force-android-desktop",
+    generate_pyl_entry = False,
+    args = [
+        "--force-android-desktop",
+    ],
+)
+
 targets.mixin(
     name = "fuchsia-code-coverage",
     generate_pyl_entry = False,