commit 567ee489c7d6bcee34e342b218ccad1ce38e630e
author Osama Fathy <osamafathy@google.com> Fri May 05 10:00:55 2023
committer Chromium LUCI CQ <chromium-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri May 05 10:00:55 2023
tree b5556fc568cb2d014efaddea401db12a440cd1ba
parent 9c90b18a72d25f1ff019f080b01ff8b647012425

Reland "[OOBE][CHOOBE] Enable OobeSkipAssistant flag"

This is a reland of commit 2883581fd861a873ca7a7b6523752c03076cbaa0

Original change's description:
> [OOBE][CHOOBE] Enable OobeSkipAssistant flag
>
> Bug: b:279886931
> Change-Id: Ie69e5b456d5377ecbcb4750aa076dc82a6ef5f2b
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4496403
> Reviewed-by: Danila Kuzmin <dkuzmin@google.com>
> Auto-Submit: Osama Fathy <osamafathy@google.com>
> Commit-Queue: Danila Kuzmin <dkuzmin@google.com>
> Cr-Commit-Position: refs/heads/main@{#1138857}

Bug: b:279886931
Change-Id: I669a91aae2fd91555082fae211173dda5112bbb8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4506700
Commit-Queue: Osama Fathy <osamafathy@google.com>
Reviewed-by: Danila Kuzmin <dkuzmin@google.com>
Cr-Commit-Position: refs/heads/main@{#1140008}

ash/constants/ash_features.cc

diff --git a/ash/constants/ash_features.cc b/ash/constants/ash_features.cc
index 5411156..22006b9 100644
--- a/ash/constants/ash_features.cc
+++ b/ash/constants/ash_features.cc
@@ -1580,7 +1580,7 @@
 // Enables Skipping the assistant setup screen in OOBE.
 BASE_FEATURE(kOobeSkipAssistant,
              "OobeSkipAssistant",
-             base::FEATURE_DISABLED_BY_DEFAULT);
+             base::FEATURE_ENABLED_BY_DEFAULT);
 
 // Enables or disables the Oobe quick start flow.
 BASE_FEATURE(kOobeQuickStart,

chrome/browser/ash/login/oobe_interactive_ui_test.cc

diff --git a/chrome/browser/ash/login/oobe_interactive_ui_test.cc b/chrome/browser/ash/login/oobe_interactive_ui_test.cc
index 74ebf6a..c9da6c88 100644
--- a/chrome/browser/ash/login/oobe_interactive_ui_test.cc
+++ b/chrome/browser/ash/login/oobe_interactive_ui_test.cc
@@ -653,7 +653,9 @@
     HandleAppDownloadingScreen();
   }
 
-  HandleAssistantOptInScreen();
+  if (!features::IsOobeSkipAssistantEnabled()) {
+    HandleAssistantOptInScreen();
+  }
 
   if (test_setup()->is_tablet() &&
       test_setup()->hide_shelf_controls_in_tablet_mode()) {