1) Add initialization error page; 2) Add connection error page.

chrome/browser/chromeos/login/wizard_controller.cc

Index: chrome/browser/chromeos/login/wizard_controller.cc
diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc
index 114229f89b317d81351acb46f35b5d4c707c2e7a..921a47fd37a41c6579492141b05b082bf55544ad 100644
--- a/chrome/browser/chromeos/login/wizard_controller.cc
+++ b/chrome/browser/chromeos/login/wizard_controller.cc
@@ -616,7 +616,7 @@ void WizardController::OnUpdateCompleted() {
                             ->IsSharkRequisition();
   if (is_shark || IsBootstrappingMaster()) {
     ShowControllerPairingScreen();
-  } else if (IsBootstrappingSlave()) {
+  } else if (IsBootstrappingSlave() && shark_controller_detected_) {

[dzhioev (left Google), 2015/12/17 23:33:32]

What is this change needed for?

[xdai1, 2015/12/17 23:49:08]

The idea is that we should not show the host pairing screen if there is no valid
controller connected with the Chrome OS device even with the slave flag
specified. In this case, we should fall back to the normal manual enrollment
process.

This way, the Chrome OS device with the slave flag specified behaves the same
way as before if there is no bootstrapping attempt nearby.

     ShowHostPairingScreen();
   } else {
     ShowAutoEnrollmentCheckScreen();
@@ -1326,7 +1326,7 @@ bool WizardController::SetOnTimeZoneResolvedForTesting(
 }
 
 bool WizardController::IsHostPairingOobe() const {
-  return IsRemoraRequisition() &&
+  return (IsRemoraRequisition() || IsBootstrappingSlave()) &&
          (base::CommandLine::ForCurrentProcess()->HasSwitch(
               switches::kHostPairingOobe) ||
           shark_controller_detected_);