Skip to content

Commit 042f50d

Browse files
ericwilligersChromium LUCI CQ
authored andcommitted
[Lacros] Run multi profile feature tests with Lacros disabled
Lacros does not support the ChromeOS Legacy multi profile feature. Various tests in chrome_shelf_controller_unittest.cc previously failed if the LacrosSupport flag was enabled. Such tests are now run with the flag explicitly disabled. Bug: 1258445 Change-Id: If3e180992354fab71fdbf0ad1705637c65adfded Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3216927 Auto-Submit: Eric Willigers <[email protected]> Commit-Queue: Stefan Kuhne <[email protected]> Reviewed-by: Stefan Kuhne <[email protected]> Cr-Commit-Position: refs/heads/main@{#930230}
1 parent 36a7d69 commit 042f50d

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

chrome/browser/ui/ash/shelf/chrome_shelf_controller_unittest.cc

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1296,7 +1296,11 @@ class V2App {
12961296
class MultiProfileMultiBrowserShelfLayoutChromeShelfControllerTest
12971297
: public ChromeShelfControllerTestBase {
12981298
protected:
1299-
MultiProfileMultiBrowserShelfLayoutChromeShelfControllerTest() = default;
1299+
MultiProfileMultiBrowserShelfLayoutChromeShelfControllerTest() {
1300+
// Lacros does not support the ChromeOS Legacy multi profile feature.
1301+
scoped_feature_list_.InitAndDisableFeature(
1302+
chromeos::features::kLacrosSupport);
1303+
}
13001304
MultiProfileMultiBrowserShelfLayoutChromeShelfControllerTest(
13011305
const MultiProfileMultiBrowserShelfLayoutChromeShelfControllerTest&) =
13021306
delete;
@@ -1413,6 +1417,7 @@ class MultiProfileMultiBrowserShelfLayoutChromeShelfControllerTest
14131417
std::unique_ptr<user_manager::ScopedUserManager> user_manager_enabler_;
14141418

14151419
ProfileToNameMap created_profiles_;
1420+
base::test::ScopedFeatureList scoped_feature_list_;
14161421
};
14171422

14181423
class ChromeShelfControllerMultiProfileWithArcTest

0 commit comments

Comments
 (0)