oobe: Delete ScreenExitCode enum

All usages have been removed in favour of per-screen exit codes.

BUG=930267

Change-Id: I0f5b0164f3c74cf3fdf3f0c45743f0df71b30852
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1506564
Commit-Queue: Toni Baržić <tbarzic@chromium.org>
Reviewed-by: Jacob Dufault <jdufault@chromium.org>
Cr-Commit-Position: refs/heads/master@{#638445}

chrome/browser/chromeos/BUILD.gn

@@ -1277,8 +1277,6 @@ source_set("chromeos") {
     "login/screens/reset_screen.cc",
     "login/screens/reset_screen.h",
     "login/screens/reset_view.h",
-    "login/screens/screen_exit_code.cc",
-    "login/screens/screen_exit_code.h",
     "login/screens/supervision_transition_screen.cc",
     "login/screens/supervision_transition_screen.h",
     "login/screens/supervision_transition_screen_view.h",

chrome/browser/chromeos/login/demo_mode/demo_setup_browsertest.cc

@@ -24,7 +24,6 @@
 #include "chrome/browser/chromeos/login/oobe_screen.h"
 #include "chrome/browser/chromeos/login/screens/demo_setup_screen.h"
 #include "chrome/browser/chromeos/login/screens/network_screen.h"
-#include "chrome/browser/chromeos/login/screens/screen_exit_code.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/test/enrollment_helper_mixin.h"
 #include "chrome/browser/chromeos/login/test/js_checker.h"

chrome/browser/chromeos/login/screens/arc_terms_of_service_screen.cc

@@ -6,7 +6,6 @@
 
 #include "chrome/browser/chromeos/login/screens/arc_terms_of_service_screen_view.h"
 #include "chrome/browser/chromeos/login/screens/base_screen_delegate.h"
-#include "chrome/browser/chromeos/login/screens/screen_exit_code.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/metrics/metrics_reporting_state.h"
 #include "chrome/browser/profiles/profile.h"

chrome/browser/chromeos/login/screens/base_screen.cc

@@ -97,10 +97,6 @@ void BaseScreen::CommitContextChanges() {
   channel_->CommitContextChanges(diff);
 }
 
-void BaseScreen::Finish(ScreenExitCode exit_code) {
-  base_screen_delegate_->OnExit(exit_code);
-}
-
 void BaseScreen::OnUserAction(const std::string& action_id) {
   LOG(WARNING) << "Unhandled user action: action_id=" << action_id;
 }

chrome/browser/chromeos/login/screens/base_screen.h

@@ -102,10 +102,6 @@ class BaseScreen {
   // Sends all pending context changes to the JS side.
   void CommitContextChanges();
 
-  // Screen can call this method to notify framework that it have finished
-  // it's work with |outcome|.
-  void Finish(ScreenExitCode exit_code);
-
   // The method is called each time some key in screen context is
   // updated by JS side. Default implementation does nothing, so
   // subclasses should override it in order to observe updates in

chrome/browser/chromeos/login/screens/base_screen_delegate.h

@@ -5,8 +5,6 @@
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_BASE_SCREEN_DELEGATE_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_BASE_SCREEN_DELEGATE_H_
 
-#include "chrome/browser/chromeos/login/screens/screen_exit_code.h"
-
 namespace chromeos {
 
 class BaseScreen;
@@ -16,9 +14,6 @@ class ErrorScreen;
 // screens.
 class BaseScreenDelegate {
  public:
-  // Method called by a screen when user's done with it.
-  virtual void OnExit(ScreenExitCode exit_code) = 0;
-
   // Forces current screen showing.
   virtual void ShowCurrentScreen() = 0;
 

chrome/browser/chromeos/login/screens/demo_preferences_screen.cc

@@ -7,7 +7,6 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/screens/base_screen_delegate.h"
 #include "chrome/browser/chromeos/login/screens/demo_preferences_screen_view.h"
-#include "chrome/browser/chromeos/login/screens/screen_exit_code.h"
 #include "chrome/browser/chromeos/login/screens/welcome_screen.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/common/pref_names.h"

chrome/browser/chromeos/login/screens/mock_base_screen_delegate.h

@@ -20,7 +20,6 @@ class MockBaseScreenDelegate : public BaseScreenDelegate {
   MockBaseScreenDelegate();
   virtual ~MockBaseScreenDelegate();
 
-  MOCK_METHOD1(OnExit, void(ScreenExitCode));
   MOCK_METHOD0(ShowCurrentScreen, void());
   MOCK_METHOD0(GetErrorScreen, ErrorScreen*());
   MOCK_METHOD0(ShowErrorScreen, void());

chrome/browser/chromeos/login/screens/network_screen.cc

@@ -12,7 +12,6 @@
 #include "chrome/browser/chromeos/login/screen_manager.h"
 #include "chrome/browser/chromeos/login/screens/base_screen_delegate.h"
 #include "chrome/browser/chromeos/login/screens/network_screen_view.h"
-#include "chrome/browser/chromeos/login/screens/screen_exit_code.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"

chrome/browser/chromeos/login/screens/screen_exit_code.cc

-// Copyright 2017 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.
-
-#include "chrome/browser/chromeos/login/screens/screen_exit_code.h"
-
-#include "base/logging.h"
-
-namespace chromeos {
-
-std::string ExitCodeToString(ScreenExitCode code) {
-  switch (code) {
-    case ScreenExitCode::DEPRECATED_WELCOME_CONTINUED:
-      return "WELCOME_CONTINUED";
-    case ScreenExitCode::DEPRECATED_HID_DETECTION_COMPLETED:
-      return "HID_DETECTION_COMPLETED";
-    case ScreenExitCode::DEPRECATED_CONNECTION_FAILED:
-      return "CONNECTION_FAILED";
-    case ScreenExitCode::DEPRECATED_UPDATE_INSTALLED:
-      return "UPDATE_INSTALLED";
-    case ScreenExitCode::DEPRECATED_UPDATE_NOUPDATE:
-      return "UPDATE_NOUPDATE";
-    case ScreenExitCode::DEPRECATED_UPDATE_ERROR_CHECKING_FOR_UPDATE:
-      return "UPDATE_ERROR_CHECKING_FOR_UPDATE";
-    case ScreenExitCode::DEPRECATED_UPDATE_ERROR_UPDATING:
-      return "UPDATE_ERROR_UPDATING";
-    case ScreenExitCode::DEPRECATED_USER_IMAGE_SELECTED:
-      return "USER_IMAGE_SELECTED";
-    case ScreenExitCode::DEPRECATED_EULA_ACCEPTED:
-      return "EULA_ACCEPTED";
-    case ScreenExitCode::DEPRECATED_EULA_BACK:
-      return "EULA_BACK";
-    case ScreenExitCode::DEPRECATED_ENTERPRISE_AUTO_ENROLLMENT_CHECK_COMPLETED:
-      return "ENTERPRISE_AUTO_ENROLLMENT_CHECK_COMPLETED";
-    case ScreenExitCode::DEPRECATED_ENTERPRISE_ENROLLMENT_COMPLETED:
-      return "ENTERPRISE_ENROLLMENT_COMPLETED";
-    case ScreenExitCode::DEPRECATED_ENTERPRISE_ENROLLMENT_BACK:
-      return "ENTERPRISE_ENROLLMENT_BACK";
-    case ScreenExitCode::DEPRECATED_RESET_CANCELED:
-      return "RESET_CANCELED";
-    case ScreenExitCode::DEPRECATED_KIOSK_AUTOLAUNCH_CANCELED:
-      return "KIOSK_AUTOLAUNCH_CANCELED";
-    case ScreenExitCode::DEPRECATED_KIOSK_AUTOLAUNCH_CONFIRMED:
-      return "KIOSK_AUTOLAUNCH_CONFIRMED";
-    case ScreenExitCode::DEPRECATED_KIOSK_ENABLE_COMPLETED:
-      return "KIOSK_ENABLE_COMPLETED";
-    case ScreenExitCode::DEPRECATED_TERMS_OF_SERVICE_DECLINED:
-      return "TERMS_OF_SERVICE_DECLINED";
-    case ScreenExitCode::DEPRECATED_TERMS_OF_SERVICE_ACCEPTED:
-      return "TERMS_OF_SERVICE_ACCEPTED";
-    case ScreenExitCode::DEPRECATED_WRONG_HWID_WARNING_SKIPPED:
-      return "WRONG_HWID_WARNING_SKIPPED";
-    case ScreenExitCode::DEPRECATED_ENABLE_DEBUGGING_FINISHED:
-      return "ENABLE_DEBUGGING_FINISHED";
-    case ScreenExitCode::DEPRECATED_ENABLE_DEBUGGING_CANCELED:
-      return "ENABLE_DEBUGGING_CANCELED";
-    case ScreenExitCode::DEPRECATED_ARC_TERMS_OF_SERVICE_SKIPPED:
-      return "ARC_TERMS_OF_SERVICE_SKIPPED";
-    case ScreenExitCode::DEPRECATED_ARC_TERMS_OF_SERVICE_ACCEPTED:
-      return "ARC_TERMS_OF_SERVICE_ACCEPTED";
-    case ScreenExitCode::DEPRECATED_UPDATE_ERROR_UPDATING_CRITICAL_UPDATE:
-      return "UPDATE_ERROR_UPDATING_CRITICAL_UPDATE";
-    case ScreenExitCode::DEPRECATED_SYNC_CONSENT_FINISHED:
-      return "SYNC_CONSENT_FINISHED";
-    case ScreenExitCode::DEPRECATED_DEMO_MODE_SETUP_FINISHED:
-      return "DEMO_MODE_SETUP_FINISHED";
-    case ScreenExitCode::DEPRECATED_DEMO_MODE_SETUP_CANCELED:
-      return "DEMO_MODE_SETUP_CANCELED";
-    case ScreenExitCode::DEPRECATED_RECOMMEND_APPS_SKIPPED:
-      return "RECOMMEND_APPS_SKIPPED";
-    case ScreenExitCode::DEPRECATED_RECOMMEND_APPS_SELECTED:
-      return "RECOMMEND_APPS_SELECTED";
-    case ScreenExitCode::DEPRECATED_DEMO_MODE_PREFERENCES_CONTINUED:
-      return "DEMO_MODE_PREFERENCES_CONTINUED";
-    case ScreenExitCode::DEPRECATED_DEMO_MODE_PREFERENCES_CANCELED:
-      return "DEMO_MODE_PREFERENCES_CANCELED";
-    case ScreenExitCode::DEPRECATED_APP_DOWNLOADING_FINISHED:
-      return "APP_DOWNLOADING_FINISHED";
-    case ScreenExitCode::DEPRECATED_ARC_TERMS_OF_SERVICE_BACK:
-      return "ARC_TERMS_OF_SERVICE_BACK";
-    case ScreenExitCode::DEPRECATED_DISCOVER_FINISHED:
-      return "DISCOVER_FINISHED";
-    case ScreenExitCode::DEPRECATED_NETWORK_BACK:
-      return "NETWORK_BACK";
-    case ScreenExitCode::DEPRECATED_NETWORK_CONNECTED:
-      return "NETWORK_CONNECTED";
-    case ScreenExitCode::DEPRECATED_NETWORK_OFFLINE_DEMO_SETUP:
-      return "NETWORK_OFFLINE_DEMO_SETUP";
-    case ScreenExitCode::DEPRECATED_FINGERPRINT_SETUP_FINISHED:
-      return "FINGERPRINT_SETUP_FINISHED";
-    case ScreenExitCode::DEPRECATED_MARKETING_OPT_IN_FINISHED:
-      return "MARKETING_OPT_IN_FINISHED";
-    case ScreenExitCode::DEPRECATED_ASSISTANT_OPTIN_FLOW_FINISHED:
-      return "ASSISTANT_OPTIN_FLOW_FINISHED";
-    case ScreenExitCode::DEPRECATED_MULTIDEVICE_SETUP_FINISHED:
-      return "MULTIDEVICE_SETUP_FINISHED";
-    case ScreenExitCode::DEPRECATED_SUPERVISION_TRANSITION_FINISHED:
-      return "SUPERVISION_TRANSITION_FINISHED";
-    case ScreenExitCode::EXIT_CODES_COUNT:
-    default:
-      NOTREACHED();
-      return "";
-  }
-}
-
-}  // namespace chromeos

chrome/browser/chromeos/login/screens/screen_exit_code.h

-// Copyright 2017 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_CHROMEOS_LOGIN_SCREENS_SCREEN_EXIT_CODE_H_
-#define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_SCREEN_EXIT_CODE_H_
-
-#include <string>
-
-namespace chromeos {
-
-// Each login screen or a view shown within login wizard view is itself a
-// state. Upon exit each view returns one of the results by calling
-// the BaseScreenDelegate::OnExit() method. Depending on the result and the
-// current view or state the login wizard decides what is the next view to show.
-//
-// There must be an exit code for each way to exit the screen for each screen.
-//
-// Numeric ids are provided to facilitate interpretation of log files only,
-// they are subject to change without notice.
-enum class ScreenExitCode {
-  // "Continue" was pressed on welcome screen.
-  DEPRECATED_WELCOME_CONTINUED = 0,
-  DEPRECATED_HID_DETECTION_COMPLETED = 1,
-  // Connection failed while trying to load a WebPageScreen.
-  DEPRECATED_CONNECTION_FAILED = 2,
-  DEPRECATED_UPDATE_INSTALLED = 3,
-  // This exit code means EITHER that there was no update, OR that there
-  // was an update, but that it was not a "critical" update. "Critical" updates
-  // are those that have a deadline and require the device to reboot.
-  DEPRECATED_UPDATE_NOUPDATE = 4,
-  DEPRECATED_UPDATE_ERROR_CHECKING_FOR_UPDATE = 5,
-  DEPRECATED_UPDATE_ERROR_UPDATING = 6,
-  DEPRECATED_USER_IMAGE_SELECTED = 7,
-  DEPRECATED_EULA_ACCEPTED = 8,
-  DEPRECATED_EULA_BACK = 9,
-  DEPRECATED_ENTERPRISE_AUTO_ENROLLMENT_CHECK_COMPLETED = 10,
-  DEPRECATED_ENTERPRISE_ENROLLMENT_COMPLETED = 11,
-  DEPRECATED_ENTERPRISE_ENROLLMENT_BACK = 12,
-  DEPRECATED_RESET_CANCELED = 13,
-  DEPRECATED_KIOSK_AUTOLAUNCH_CANCELED = 14,
-  DEPRECATED_KIOSK_AUTOLAUNCH_CONFIRMED = 15,
-  DEPRECATED_KIOSK_ENABLE_COMPLETED = 16,
-  DEPRECATED_TERMS_OF_SERVICE_DECLINED = 17,
-  DEPRECATED_TERMS_OF_SERVICE_ACCEPTED = 18,
-  DEPRECATED_WRONG_HWID_WARNING_SKIPPED = 19,
-  DEPRECATED_ENABLE_DEBUGGING_FINISHED = 21,
-  DEPRECATED_ENABLE_DEBUGGING_CANCELED = 22,
-  DEPRECATED_ARC_TERMS_OF_SERVICE_SKIPPED = 23,
-  DEPRECATED_ARC_TERMS_OF_SERVICE_ACCEPTED = 24,
-  DEPRECATED_UPDATE_ERROR_UPDATING_CRITICAL_UPDATE = 25,
-  DEPRECATED_ENCRYPTION_MIGRATION_FINISHED = 26,
-  DEPRECATED_ENCRYPTION_MIGRATION_SKIPPED = 27,
-  DEPRECATED_SYNC_CONSENT_FINISHED = 32,
-  DEPRECATED_DEMO_MODE_SETUP_FINISHED = 33,
-  DEPRECATED_DEMO_MODE_SETUP_CANCELED = 34,
-  DEPRECATED_RECOMMEND_APPS_SKIPPED = 35,
-  DEPRECATED_RECOMMEND_APPS_SELECTED = 36,
-  DEPRECATED_DEMO_MODE_PREFERENCES_CONTINUED = 37,
-  DEPRECATED_DEMO_MODE_PREFERENCES_CANCELED = 38,
-  DEPRECATED_APP_DOWNLOADING_FINISHED = 39,
-  DEPRECATED_ARC_TERMS_OF_SERVICE_BACK = 40,
-  DEPRECATED_DISCOVER_FINISHED = 41,
-  DEPRECATED_NETWORK_BACK = 42,
-  DEPRECATED_NETWORK_CONNECTED = 43,
-  DEPRECATED_NETWORK_OFFLINE_DEMO_SETUP = 44,
-  DEPRECATED_FINGERPRINT_SETUP_FINISHED = 45,
-  DEPRECATED_MARKETING_OPT_IN_FINISHED = 46,
-  DEPRECATED_ASSISTANT_OPTIN_FLOW_FINISHED = 47,
-  DEPRECATED_MULTIDEVICE_SETUP_FINISHED = 48,
-  DEPRECATED_UPDATE_REJECT_OVER_CELLULAR = 49,
-  DEPRECATED_SUPERVISION_TRANSITION_FINISHED = 50,
-  EXIT_CODES_COUNT  // not a real code, must be the last
-};
-
-std::string ExitCodeToString(ScreenExitCode code);
-
-}  // namespace chromeos
-
-#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_SCREEN_EXIT_CODE_H_

chrome/browser/chromeos/login/screens/welcome_screen.cc

@@ -19,7 +19,6 @@
 #include "chrome/browser/chromeos/login/oobe_screen.h"
 #include "chrome/browser/chromeos/login/screen_manager.h"
 #include "chrome/browser/chromeos/login/screens/base_screen_delegate.h"
-#include "chrome/browser/chromeos/login/screens/screen_exit_code.h"
 #include "chrome/browser/chromeos/login/screens/welcome_view.h"
 #include "chrome/browser/chromeos/login/ui/input_events_blocker.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"

chrome/browser/chromeos/login/wizard_controller.cc

@@ -1541,9 +1541,6 @@ void WizardController::SimulateDemoModeSetupForTesting(
 
 ///////////////////////////////////////////////////////////////////////////////
 // WizardController, BaseScreenDelegate overrides:
-void WizardController::OnExit(ScreenExitCode exit_code) {
-}
-
 void WizardController::ShowErrorScreen() {
   VLOG(1) << "Showing error screen.";
   SetCurrentScreen(GetScreen(OobeScreen::SCREEN_ERROR_MESSAGE));

chrome/browser/chromeos/login/wizard_controller.h

@@ -262,7 +262,6 @@ class WizardController : public BaseScreenDelegate,
   void PerformOOBECompletedActions();
 
   // Overridden from BaseScreenDelegate:
-  void OnExit(ScreenExitCode exit_code) override;
   void ShowCurrentScreen() override;
   ErrorScreen* GetErrorScreen() override;
   void ShowErrorScreen() override;

chrome/browser/chromeos/login/wizard_controller_browsertest.cc

@@ -723,10 +723,6 @@ class WizardControllerFlowTest : public WizardControllerTest {
         default_network->guid(), online_state);
   }
 
-  void OnExit(ScreenExitCode exit_code) {
-    WizardController::default_controller()->OnExit(exit_code);
-  }
-
   chromeos::SimpleGeolocationProvider* GetGeolocationProvider() {
     return WizardController::default_controller()->geolocation_provider_.get();
   }
@@ -2761,10 +2757,6 @@ class WizardControllerOobeResumeTest : public WizardControllerTest {
                                 base::Unretained(wizard_controller))));
   }
 
-  void OnExit(ScreenExitCode exit_code) {
-    WizardController::default_controller()->OnExit(exit_code);
-  }
-
   OobeScreen GetFirstScreen() {
     return WizardController::default_controller()->first_screen();
   }
@@ -2914,7 +2906,4 @@ IN_PROC_BROWSER_TEST_F(WizardControllerOobeConfigurationTest,
 
 // TODO(khorimoto): Add tests for MultiDevice Setup UI.
 
-static_assert(static_cast<int>(ScreenExitCode::EXIT_CODES_COUNT) == 51,
-              "tests for new control flow are missing");
-
 }  // namespace chromeos