Merge M43: Fix crash on Enrollment screen.

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

Index: chrome/browser/ui/webui/chromeos/login/oobe_ui.h
diff --git a/chrome/browser/ui/webui/chromeos/login/oobe_ui.h b/chrome/browser/ui/webui/chromeos/login/oobe_ui.h
index 59a9a3a645e3c1abe45b243c664fcdf7f7f81a3d..45b05aa266a85c8be1415036f999a496ef4030c3 100644
--- a/chrome/browser/ui/webui/chromeos/login/oobe_ui.h
+++ b/chrome/browser/ui/webui/chromeos/login/oobe_ui.h
@@ -110,7 +110,7 @@ class OobeUI : public OobeDisplay,
   KioskEnableScreenActor* GetKioskEnableScreenActor() override;
   TermsOfServiceScreenActor* GetTermsOfServiceScreenActor() override;
   UserImageView* GetUserImageView() override;
-  NetworkErrorView* GetNetworkErrorView() override;
+  ErrorScreen* GetErrorScreen() override;
   WrongHWIDScreenActor* GetWrongHWIDScreenActor() override;
   AutoEnrollmentCheckScreenActor* GetAutoEnrollmentCheckScreenActor() override;
   SupervisedUserCreationScreenHandler* GetSupervisedUserCreationScreenActor()
@@ -168,11 +168,6 @@ class OobeUI : public OobeDisplay,
     return network_state_informer_.get();
   }
 
-  // If an error screen was created during initialization, then it may be
-  // fetched using this method, while also passing the ownership of
-  // |error_screen_|.
-  scoped_ptr<ErrorScreen> GetErrorScreen();
-
  private:
   // Initializes |screen_ids_| and |screen_names_| structures.
   void InitializeScreenMaps();