cros: Defer lockscreen updateUserImage and loadUser calls.

chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

Index: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
index 3e90662d7f912257d55c99ca2287801e4ad08522..045d61ee5523d97d5f77083c5f6079bf9cc27102 100644
--- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
@@ -1021,8 +1021,12 @@ void SigninScreenHandler::OnUserRemoved(const AccountId& account_id,
 }
 
 void SigninScreenHandler::OnUserImageChanged(const user_manager::User& user) {
-  if (page_is_ready())
-    CallJS("login.AccountPickerScreen.updateUserImage", user.GetAccountId());
+  if (page_is_ready()) {
+    // TODO(jdufault): Remove DCHECK after resolving crbug.com/699798
+    DCHECK(is_js_initialized_and_ready());
+    CallJSOrDefer("login.AccountPickerScreen.updateUserImage",
+                  user.GetAccountId());
+  }
 }
 
 void SigninScreenHandler::OnPreferencesChanged() {
@@ -1303,9 +1307,10 @@ void SigninScreenHandler::HandleToggleKioskAutolaunchScreen() {
 
 void SigninScreenHandler::LoadUsers(const base::ListValue& users_list,
                                     bool showGuest) {
-  CallJS("login.AccountPickerScreen.loadUsers",
-         users_list,
-         delegate_->IsShowGuest());
+  // TODO(jdufault): Remove DCHECK after resolving crbug.com/699798
+  DCHECK(is_js_initialized_and_ready());
+  CallJSOrDefer("login.AccountPickerScreen.loadUsers", users_list,
+                delegate_->IsShowGuest());
 }
 
 void SigninScreenHandler::HandleAccountPickerReady() {