From e4c2037c555c0b90b3e229bed988eefbc74f604b Mon Sep 17 00:00:00 2001
From: Takashi Sakamoto <tasak@google.com>
Date: Wed, 1 Nov 2023 18:54:43 +0000
Subject: [PATCH] Fix All/DesksClientTest.SystemUILaunchSnappedWindow/* timeout
 on chromeos bots

First build failure:
https://ci.chromium.org/ui/p/chromium/builders/ci/linux-chromeos-rel/70538/overview

The timeouts seem to be caused by crrev.com/c/4987197. If
FasterSplitScreenSetup is enabled, the tests seem to fail.

(cherry picked from commit e52bd1b3100e0c094f9c34d415330133f3958cf3)

Bug: 1497876
Change-Id: I5e958d60566c7ebf8afde93cdfacd2b79d3d8bb8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4992541
Reviewed-by: Miriam Polzer <mpolzer@google.com>
Owners-Override: Miriam Polzer <mpolzer@google.com>
Commit-Queue: Takashi Sakamoto <tasak@google.com>
Cr-Original-Commit-Position: refs/heads/main@{#1217995}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4998187
Commit-Queue: Joe Downing <joedow@chromium.org>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Owners-Override: Joe Downing <joedow@chromium.org>
Cr-Commit-Position: refs/branch-heads/6099@{#60}
Cr-Branched-From: e6ee4500f7d6549a9ac1354f8d056da49ef406be-refs/heads/main@{#1217362}
---
 chrome/browser/ui/ash/desks/desks_client_browsertest.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/chrome/browser/ui/ash/desks/desks_client_browsertest.cc b/chrome/browser/ui/ash/desks/desks_client_browsertest.cc
index eef08c3d0015fe..075fad5a6aa35c 100644
--- a/chrome/browser/ui/ash/desks/desks_client_browsertest.cc
+++ b/chrome/browser/ui/ash/desks/desks_client_browsertest.cc
@@ -521,7 +521,8 @@ class DesksClientTest : public extensions::PlatformAppBrowserTest,
     std::vector<base::test::FeatureRef> enabled_features = {
         ash::features::kDesksTemplates};
     std::vector<base::test::FeatureRef> disabled_features = {
-        ash::features::kDeskTemplateSync};
+        ash::features::kDeskTemplateSync,
+        ash::features::kFasterSplitScreenSetup};
     if (GetParam()) {
       enabled_features.push_back(chromeos::features::kJelly);
     } else {