Merge 277888 "Logic fix for switching to Reset screen."

> Logic fix for switching to Reset screen.
> 
> BUG=382630
> 
> Review URL: https://codereview.chromium.org/335413002

TBR=merkulova@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/branches/1985/src@278313 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 8 insertions, 4 deletions

diff --git a/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc b/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc
index eed72f4..b9f26b8 100644
--- a/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc
@@ -165,8 +165,11 @@ void CoreOobeHandler::ShowDeviceResetScreen() {
       wizard_controller->AdvanceToScreen(WizardController::kResetScreenName);
     } else {
       scoped_ptr<base::DictionaryValue> params(new base::DictionaryValue());
-      LoginDisplayHostImpl::default_host()->StartWizard(
-          WizardController::kResetScreenName, params.Pass());
+      DCHECK(LoginDisplayHostImpl::default_host());
+      if (LoginDisplayHostImpl::default_host()) {
+        LoginDisplayHostImpl::default_host()->StartWizard(
+            WizardController::kResetScreenName, params.Pass());
+      }
     }
   }
 }
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 80b69af..4032405 100644
--- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
@@ -1412,9 +1412,10 @@ void SigninScreenHandler::HandleAccountPickerReady() {
 
   PrefService* prefs = g_browser_process->local_state();
   if (prefs->GetBoolean(prefs::kFactoryResetRequested)) {
-    if (core_oobe_actor_)
+    if (core_oobe_actor_) {
       core_oobe_actor_->ShowDeviceResetScreen();
-    return;
+      return;
+    }
   }
 
   is_account_picker_showing_first_time_ = true;