Commit fb22eacf authored by Roman Sorokin's avatar Roman Sorokin Committed by Commit Bot

cros oobe: Do not load Gaia when goes of the login screen

This fixes the issue when both Enrollment screen and Login screen trying
to load Gaia at the same time. SigninPartitionManager cancels one attempt
to start another one. This might break the enrollment flow when Chrome
can't extract oauth_code from the cookies partiton.

It's a bit hard to test as it's a race condition. I will add something
in a follow-up.

Bug: 1119411
Change-Id: I81c7031ae05b2882f4e86feac63e1aee9058c13e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2375426Reviewed-by: default avatarDenis Kuznetsov [CET] <antrim@chromium.org>
Commit-Queue: Roman Sorokin [CET] <rsorokin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#801818}
parent 73e69300
......@@ -74,7 +74,6 @@ void GaiaScreen::ShowImpl() {
void GaiaScreen::HideImpl() {
view_->SetGaiaPath(GaiaView::GaiaPath::kDefault);
view_->LoadGaiaAsync(EmptyAccountId());
view_->Hide();
}
......
......@@ -242,7 +242,9 @@ class ErrorScreenWatcher : public OobeUI::Observer {
class WebviewLoginTest : public OobeBaseTest {
public:
WebviewLoginTest() {
scoped_feature_list_.InitWithFeatures({features::kChildSpecificSignin}, {});
// TODO(https://crbug.com/1121910) Migrate to the kChildSpecificSignin
// enabled.
scoped_feature_list_.InitWithFeatures({}, {features::kChildSpecificSignin});
}
~WebviewLoginTest() override = default;
......@@ -425,7 +427,16 @@ IN_PROC_BROWSER_TEST_F(WebviewLoginTest, BackButton) {
test::WaitForPrimaryUserSessionStart();
}
IN_PROC_BROWSER_TEST_F(WebviewLoginTest, BackToUserCreationScreen) {
class WebviewLoginTestWithChildSigninEnabled : public WebviewLoginTest {
public:
WebviewLoginTestWithChildSigninEnabled() {
scoped_feature_list_.Reset();
scoped_feature_list_.InitWithFeatures({features::kChildSpecificSignin}, {});
}
};
IN_PROC_BROWSER_TEST_F(WebviewLoginTestWithChildSigninEnabled,
BackToUserCreationScreen) {
WaitForGaiaPageLoadAndPropertyUpdate();
// Start with identifier page.
......@@ -1331,13 +1342,7 @@ IN_PROC_BROWSER_TEST_F(WebviewProxyAuthLoginTest, DISABLED_ProxyAuthTransfer) {
ExpectIdentifierPage();
}
class WebviewLoginTestWithChildSigninDisabled : public WebviewLoginTest {
public:
WebviewLoginTestWithChildSigninDisabled() {
scoped_feature_list_.Reset();
scoped_feature_list_.InitWithFeatures({}, {features::kChildSpecificSignin});
}
};
using WebviewLoginTestWithChildSigninDisabled = WebviewLoginTest;
IN_PROC_BROWSER_TEST_F(WebviewLoginTestWithChildSigninDisabled,
ErrorScreenOnGaiaError) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment