Revert "[profiles] The profile picker supports the force signin policy"

This reverts commit 9b04f2c2.

Reason for revert: Most likely broke AppControllerProfilePickerBrowserTest.LockedProfileReopenWithNoWindows on Mac 10.11
https://ci.chromium.org/p/chromium/builders/ci/Mac10.11%20Tests/59140

Original change's description:
> [profiles] The profile picker supports the force signin policy
>
> This CL removes the restriction that disables the profile picker if the
> force signin enterprise policy is enabled.
>
> Force signin dialogs will be hosted by the profile picker if the
> corresponding feature is enabled.
>
> Bug: 1156096
> Change-Id: I19ec58afc7a451fbd868eae5e3d8d13899e78719
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2595412
> Reviewed-by: David Roger <droger@chromium.org>
> Commit-Queue: Alex Ilin <alexilin@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#840575}

TBR=droger@chromium.org,alexilin@chromium.org,chromium-scoped@luci-project-accounts.iam.gserviceaccount.com

Change-Id: I698a89a9214fd179994706d40ae58498cff4b9c7
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1156096
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2611270Reviewed-by: Morten Stenshorne <mstensho@chromium.org>
Commit-Queue: Morten Stenshorne <mstensho@chromium.org>
Cr-Commit-Position: refs/heads/master@{#840611}

chrome/browser/ui/profile_picker.cc

@@ -54,6 +54,9 @@ ProfilePicker::AvailabilityOnStartup GetAvailabilityOnStartup() {
 bool ProfilePicker::ShouldShowAtLaunch() {
   AvailabilityOnStartup availability_on_startup = GetAvailabilityOnStartup();
 
+  if (signin_util::IsForceSigninEnabled())
+    return false;
+
   if (!base::FeatureList::IsEnabled(features::kNewProfilePicker))
     return false;
 

chrome/browser/ui/startup/startup_browser_creator.cc

@@ -324,7 +324,8 @@ bool ShouldShowProfilePickerAtProcessLaunch(
 
 void ShowUserManager(bool is_process_startup) {
 #if !BUILDFLAG(IS_CHROMEOS_ASH)
-  if (base::FeatureList::IsEnabled(features::kNewProfilePicker)) {
+  if (!signin_util::IsForceSigninEnabled() &&
+      base::FeatureList::IsEnabled(features::kNewProfilePicker)) {
     ProfilePicker::Show(
         is_process_startup
             ? ProfilePicker::EntryPoint::kOnStartup

chrome/browser/ui/views/profiles/user_manager_view.cc

@@ -73,7 +73,8 @@ void UserManager::Show(
     profiles::UserManagerAction user_manager_action) {
   DCHECK(profile_path_to_focus != ProfileManager::GetGuestProfilePath());
 
-  if ((user_manager_action == profiles::USER_MANAGER_SELECT_PROFILE_NO_ACTION ||
+  if (!signin_util::IsForceSigninEnabled() &&
+      (user_manager_action == profiles::USER_MANAGER_SELECT_PROFILE_NO_ACTION ||
        user_manager_action == profiles::USER_MANAGER_OPEN_CREATE_USER_PAGE) &&
       base::FeatureList::IsEnabled(features::kNewProfilePicker)) {
     // Use the new profile picker instead.
@@ -169,10 +170,10 @@ void UserManager::AddOnUserManagerShownCallbackForTesting(
 
 // static
 base::FilePath UserManager::GetSigninProfilePath() {
-  if (g_user_manager_view)
-    return g_user_manager_view->GetSigninProfilePath();
+  if (!g_user_manager_view)
+    return base::FilePath();
 
-  return ProfilePicker::GetForceSigninProfilePath();
+  return g_user_manager_view->GetSigninProfilePath();
 }
 
 // UserManagerProfileDialog
@@ -206,54 +207,34 @@ void UserManagerProfileDialog::ShowUnlockDialogWithProfilePath(
 void UserManagerProfileDialog::ShowForceSigninDialog(
     content::BrowserContext* browser_context,
     const base::FilePath& profile_path) {
+  if (!UserManager::IsShowing())
+    return;
   GURL url = signin::GetEmbeddedPromoURL(
       signin_metrics::AccessPoint::ACCESS_POINT_USER_MANAGER,
       signin_metrics::Reason::REASON_FORCED_SIGNIN_PRIMARY_ACCOUNT, true);
-
-  if (base::FeatureList::IsEnabled(features::kNewProfilePicker)) {
-    // Use the new profile picker instead.
-    ProfilePicker::ShowDialog(browser_context, url, profile_path);
-    return;
-  }
-
-  if (!UserManager::IsShowing())
-    return;
   g_user_manager_view->ShowDialog(browser_context, url, profile_path);
 }
 
 void UserManagerProfileDialog::ShowDialogAndDisplayErrorMessage(
     content::BrowserContext* browser_context) {
-  GURL url(chrome::kChromeUISigninErrorURL);
-
-  if (base::FeatureList::IsEnabled(features::kNewProfilePicker)) {
-    // Use the new profile picker instead.
-    ProfilePicker::ShowDialog(browser_context, url, base::FilePath());
-    return;
-  }
-
   if (!UserManager::IsShowing())
     return;
   // The error occurred before sign in happened, use an empty profile path
   // so that the error page will show the error message that is assoicated with
   // the system profile.
-  g_user_manager_view->ShowDialog(browser_context, url, base::FilePath());
+  g_user_manager_view->ShowDialog(
+      browser_context, GURL(chrome::kChromeUISigninErrorURL), base::FilePath());
 }
 
 // static
 void UserManagerProfileDialog::DisplayErrorMessage() {
-  ProfilePicker::DisplayErrorMessage();
-
-  if (g_user_manager_view) {
-    g_user_manager_view->DisplayErrorMessage();
-  }
+  // This method should only be called if the user manager is already showing.
+  DCHECK(g_user_manager_view);
+  g_user_manager_view->DisplayErrorMessage();
 }
 
 // static
 void UserManagerProfileDialog::HideDialog() {
-  // Hide the profile picker dialog, in case it was opened by
-  // UserManagerProfileDialog::ShowDialog*().
-  ProfilePicker::HideDialog();
-
   if (g_user_manager_view && g_user_manager_view->GetWidget()->IsVisible())
     g_user_manager_view->HideDialog();
 }

chrome/browser/ui/webui/profile_helper.cc

@@ -26,6 +26,32 @@
 namespace webui {
 namespace {
 
+void ShowUserManager(const ProfileManager::CreateCallback& callback) {
+  if (!UserManager::IsShowing()) {
+    UserManager::Show(base::FilePath(),
+                      profiles::USER_MANAGER_SELECT_PROFILE_NO_ACTION);
+  }
+
+  g_browser_process->profile_manager()->CreateProfileAsync(
+      ProfileManager::GetSystemProfilePath(), callback, base::string16(),
+      std::string());
+}
+
+std::string GetProfileUserName(Profile* profile) {
+  ProfileAttributesEntry* entry;
+  if (!g_browser_process->profile_manager()
+           ->GetProfileAttributesStorage()
+           .GetProfileAttributesWithPath(profile->GetPath(), &entry))
+    return std::string();
+  return base::UTF16ToUTF8(entry->GetUserName());
+}
+
+void ShowUnlockDialog(const std::string& user_name,
+                      Profile* system_profile,
+                      Profile::CreateStatus status) {
+  UserManagerProfileDialog::ShowUnlockDialog(system_profile, user_name);
+}
+
 void DeleteProfileCallback(std::unique_ptr<ScopedKeepAlive> keep_alive,
                            Profile* profile) {
   OpenNewWindowForProfile(profile);
@@ -35,16 +61,17 @@ void DeleteProfileCallback(std::unique_ptr<ScopedKeepAlive> keep_alive,
 
 void OpenNewWindowForProfile(Profile* profile) {
   if (profiles::IsProfileLocked(profile->GetPath())) {
-    DCHECK(signin_util::IsForceSigninEnabled());
-    // Displays the UserManager without any sign-in dialog opened.
-    if (!UserManager::IsShowing() && !ProfilePicker::IsOpen()) {
-      UserManager::Show(base::FilePath(),
-                        profiles::USER_MANAGER_SELECT_PROFILE_NO_ACTION);
-    }
+    // The profile picker does not support locked profiles.
+    DCHECK(!ProfilePicker::IsOpen());
 
-    g_browser_process->profile_manager()->CreateProfileAsync(
-        ProfileManager::GetSystemProfilePath(),
-        ProfileManager::CreateCallback(), base::string16(), std::string());
+    if (signin_util::IsForceSigninEnabled()) {
+      // If force-sign-in policy is enabled, UserManager will be displayed
+      // without any sign-in dialog opened.
+      ShowUserManager(ProfileManager::CreateCallback());
+    } else {
+      ShowUserManager(
+          base::BindRepeating(&ShowUnlockDialog, GetProfileUserName(profile)));
+    }
     return;
   }