Network connectivity errors handling (incl. CP) for enrollment flow

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

Index: chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
index 67dfa9a32200cefd93e158677cd6e1545bdec0d1..d723cf582789a11d57963abdc061421ed8461aa6 100644
--- a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
@@ -244,8 +244,12 @@ OobeUI::OobeUI(content::WebUI* web_ui, const GURL& url)
   hid_detection_screen_actor_ = hid_detection_screen_handler;
   AddScreenHandler(hid_detection_screen_handler);
 
+  error_screen_handler_ = new ErrorScreenHandler(network_state_informer_);
+  AddScreenHandler(error_screen_handler_);
+
   EnrollmentScreenHandler* enrollment_screen_handler =
-      new EnrollmentScreenHandler();
+      new EnrollmentScreenHandler(network_state_informer_,
+                                  error_screen_handler_);
   enrollment_screen_actor_ = enrollment_screen_handler;
   AddScreenHandler(enrollment_screen_handler);
 
@@ -259,9 +263,6 @@ OobeUI::OobeUI(content::WebUI* web_ui, const GURL& url)
   user_image_screen_actor_ = user_image_screen_handler;
   AddScreenHandler(user_image_screen_handler);
 
-  error_screen_handler_ = new ErrorScreenHandler(network_state_informer_);
-  AddScreenHandler(error_screen_handler_);
-
   gaia_screen_handler_ = new GaiaScreenHandler(network_state_informer_);
   AddScreenHandler(gaia_screen_handler_);
 
@@ -518,16 +519,13 @@ const std::string& OobeUI::GetScreenName(Screen screen) const {
 
 void OobeUI::OnCurrentScreenChanged(const std::string& screen) {
   previous_screen_ = current_screen_;
-  if (screen_ids_.count(screen)) {
-    Screen new_screen = screen_ids_[screen];
-    FOR_EACH_OBSERVER(Observer,
-                      observer_list_,
-                      OnCurrentScreenChanged(current_screen_, new_screen));
-    current_screen_ = new_screen;
-  } else {
-    NOTREACHED() << "Screen should be registered in InitializeScreenMaps()";
-    current_screen_ = SCREEN_UNKNOWN;
-  }
+  DCHECK(screen_ids_.count(screen))
+      << "Screen should be registered in InitializeScreenMaps()";
+  Screen new_screen = screen_ids_[screen];
+  FOR_EACH_OBSERVER(Observer,
+                    observer_list_,
+                    OnCurrentScreenChanged(current_screen_, new_screen));
+  current_screen_ = new_screen;
 }
 
 }  // namespace chromeos