Profile unlock should always use session restore, regardless of system preference.

The UserManager will now set the ProfileInfoCache's "signin required" bit to false after the browser's opened rather than before, so that it can be read during startup.

BUG=420762

Review URL: https://codereview.chromium.org/694593002

Cr-Commit-Position: refs/heads/master@{#302459}

chrome/browser/ui/startup/session_crashed_infobar_delegate_unittest.cc

@@ -4,11 +4,13 @@
 
 #include "chrome/browser/ui/startup/session_crashed_infobar_delegate.h"
 
+#include "base/files/scoped_temp_dir.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/testing_pref_service.h"
 #include "base/run_loop.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/prefs/browser_prefs.h"
+#include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/sessions/session_service_factory.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/url_constants.h"
@@ -27,15 +29,23 @@ class SessionCrashedInfoBarDelegateUnitTest : public BrowserWithTestWindowTest {
     // This needs to be called after the local state is set, because it will
     // create a browser which will try to read from the local state.
     BrowserWithTestWindowTest::SetUp();
+
+    // Make sure we have a Profile Manager.
+    ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
+    TestingBrowserProcess::GetGlobal()->SetProfileManager(
+        new ProfileManagerWithoutInit(temp_dir_.path()));
   }
 
   void TearDown() override {
     static_cast<TestingBrowserProcess*>(g_browser_process)->SetLocalState(NULL);
     BrowserWithTestWindowTest::TearDown();
+
+    TestingBrowserProcess::GetGlobal()->SetProfileManager(NULL);
   }
 
  private:
   TestingPrefServiceSimple pref_service;
+  base::ScopedTempDir temp_dir_;
 };
 
 TEST_F(SessionCrashedInfoBarDelegateUnitTest, DetachingTabWithCrashedInfoBar) {

chrome/browser/ui/startup/startup_browser_creator.cc

@@ -388,6 +388,19 @@ SessionStartupPref StartupBrowserCreator::GetSessionStartupPref(
       !profile->IsNewProfile()) {
     pref.type = SessionStartupPref::LAST;
   }
+
+  // A browser starting for a profile being unlocked should always restore.
+  if (!profile->IsGuestSession()) {
+    ProfileInfoCache& info_cache =
+        g_browser_process->profile_manager()->GetProfileInfoCache();
+    size_t index = info_cache.GetIndexOfProfileWithPath(profile->GetPath());
+
+    if (index != std::string::npos &&
+        info_cache.ProfileIsSigninRequiredAtIndex(index)) {
+      pref.type = SessionStartupPref::LAST;
+    }
+  }
+
   if (pref.type == SessionStartupPref::LAST &&
       IncognitoModePrefs::ShouldLaunchIncognito(command_line, prefs)) {
     // We don't store session information when incognito. If the user has

chrome/browser/ui/webui/signin/user_manager_screen_handler.cc

@@ -697,8 +697,6 @@ void UserManagerScreenHandler::ReportAuthenticationResult(
   if (success) {
     ProfileInfoCache& info_cache =
         g_browser_process->profile_manager()->GetProfileInfoCache();
-    info_cache.SetProfileSigninRequiredAtIndex(
-        authenticating_profile_index_, false);
     base::FilePath path = info_cache.GetPathOfProfileAtIndex(
         authenticating_profile_index_);
     profiles::SwitchToProfile(
@@ -724,6 +722,15 @@ void UserManagerScreenHandler::ReportAuthenticationResult(
 void UserManagerScreenHandler::OnBrowserWindowReady(Browser* browser) {
   DCHECK(browser);
   DCHECK(browser->window());
+
+  // Unlock the profile after browser opens so startup can read the lock bit.
+  // Any necessary authentication must have been successful to reach this point.
+  ProfileInfoCache& info_cache =
+      g_browser_process->profile_manager()->GetProfileInfoCache();
+  size_t index = info_cache.GetIndexOfProfileWithPath(
+      browser->profile()->GetPath());
+  info_cache.SetProfileSigninRequiredAtIndex(index, false);
+
   if (url_hash_ == profiles::kUserManagerSelectProfileTaskManager) {
     base::MessageLoop::current()->PostTask(
         FROM_HERE, base::Bind(&chrome::OpenTaskManager, browser));