Merge M43: Fix crash on Enrollment screen.

chrome/browser/chromeos/login/ui/oobe_display.h

Index: chrome/browser/chromeos/login/ui/oobe_display.h
diff --git a/chrome/browser/chromeos/login/ui/oobe_display.h b/chrome/browser/chromeos/login/ui/oobe_display.h
index 1bf92f38e8f8deac238471bcf1ecd815e9ffcedf..75f6614bc2b4ff47f4f31ad87adf2d9b4c8b6456 100644
--- a/chrome/browser/chromeos/login/ui/oobe_display.h
+++ b/chrome/browser/chromeos/login/ui/oobe_display.h
@@ -19,6 +19,7 @@ class CoreOobeActor;
 class DeviceDisabledScreenActor;
 class EnableDebuggingScreenActor;
 class EnrollmentScreenActor;
+class ErrorScreen;
 class EulaView;
 class GaiaScreenHandler;
 class HIDDetectionView;
@@ -84,7 +85,7 @@ class OobeDisplay {
   virtual KioskEnableScreenActor* GetKioskEnableScreenActor() = 0;
   virtual TermsOfServiceScreenActor* GetTermsOfServiceScreenActor() = 0;
   virtual UserImageView* GetUserImageView() = 0;
-  virtual NetworkErrorView* GetNetworkErrorView() = 0;
+  virtual ErrorScreen* GetErrorScreen() = 0;
   virtual WrongHWIDScreenActor* GetWrongHWIDScreenActor() = 0;
   virtual AutoEnrollmentCheckScreenActor*
       GetAutoEnrollmentCheckScreenActor() = 0;