Merge M43: Fix crash on Enrollment screen.

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

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_OOBE_UI_H_
 #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_OOBE_UI_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 92 matching lines @@
   NetworkView* GetNetworkView() override;
   EulaView* GetEulaView() override;
   UpdateView* GetUpdateView() override;
   EnableDebuggingScreenActor* GetEnableDebuggingScreenActor() override;
   EnrollmentScreenActor* GetEnrollmentScreenActor() override;
   ResetView* GetResetView() override;
   KioskAutolaunchScreenActor* GetKioskAutolaunchScreenActor() override;
   KioskEnableScreenActor* GetKioskEnableScreenActor() override;
   TermsOfServiceScreenActor* GetTermsOfServiceScreenActor() override;
   UserImageView* GetUserImageView() override;
-  NetworkErrorView* GetNetworkErrorView() override;
+  ErrorScreen* GetErrorScreen() override;
   WrongHWIDScreenActor* GetWrongHWIDScreenActor() override;
   AutoEnrollmentCheckScreenActor* GetAutoEnrollmentCheckScreenActor() override;
   SupervisedUserCreationScreenHandler* GetSupervisedUserCreationScreenActor()
       override;
   AppLaunchSplashScreenActor* GetAppLaunchSplashScreenActor() override;
   bool IsJSReady(const base::Closure& display_is_ready_callback) override;
   HIDDetectionView* GetHIDDetectionView() override;
   ControllerPairingScreenActor* GetControllerPairingScreenActor() override;
   HostPairingScreenActor* GetHostPairingScreenActor() override;
   DeviceDisabledScreenActor* GetDeviceDisabledScreenActor() override;
@@ skipping 37 matching lines @@
   const std::string& GetScreenName(Screen screen) const;
 
   SigninScreenHandler* signin_screen_handler_for_test() {
     return signin_screen_handler_;
   }
 
   NetworkStateInformer* network_state_informer_for_test() const {
     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();
 
   void AddScreenHandler(BaseScreenHandler* handler);
 
   // CoreOobeHandler::Delegate implementation:
   void OnCurrentScreenChanged(const std::string& screen) override;
 
   // Type of UI.
@@ skipping 78 matching lines @@
 
   // Observer of CrosSettings watching the kRebootOnShutdown policy.
   scoped_ptr<ShutdownPolicyHandler> shutdown_policy_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(OobeUI);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_OOBE_UI_H_