Initialize screen locker before letting user logged in.

chrome/browser/browser_main.cc

Index: chrome/browser/browser_main.cc
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index 2d959c31a525d44a6b4b8b577be9f868dcb6156c..abcdb645966291760439eb64b95db21672848fbb 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -615,7 +615,6 @@ void OptionallyRunChromeOSLoginManager(const CommandLine& parsed_command_line) {
     }
     browser::ShowLoginWizard(first_screen, size);
   }
-  chromeos::ScreenLocker::InitClass();
 }
 #else
 void OptionallyRunChromeOSLoginManager(const CommandLine& parsed_command_line) {
@@ -1037,6 +1036,10 @@ int BrowserMain(const MainFunctionParams& parameters) {
   // Profile creation ----------------------------------------------------------
 
 #if defined(OS_CHROMEOS)
+  // Initialize the screen locker now so that it can receive
+  // LOGIN_USER_CHANGED notification from UserManager.
+  chromeos::ScreenLocker::InitClass();
+
   // This forces the ProfileManager to be created and register for the
   // notification it needs to track the logged in user.
   g_browser_process->profile_manager()->GetDefaultProfile();