cros: Replace WizardController string constants with OobeScreen values.

chrome/browser/chromeos/login/oobe_screen.h

Index: chrome/browser/chromeos/login/oobe_screen.h
diff --git a/chrome/browser/ui/webui/chromeos/login/oobe_screen.h b/chrome/browser/chromeos/login/oobe_screen.h
similarity index 72%
rename from chrome/browser/ui/webui/chromeos/login/oobe_screen.h
rename to chrome/browser/chromeos/login/oobe_screen.h
index 111e011b4212ded1e8e011bab29ce256c572a05f..3b8e96539ed5b575643b1d4e6bd2895ef1f0d152 100644
--- a/chrome/browser/ui/webui/chromeos/login/oobe_screen.h
+++ b/chrome/browser/chromeos/login/oobe_screen.h
@@ -2,13 +2,16 @@
 // 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_SCREEN_H_
-#define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_OOBE_SCREEN_H_
+#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_OOBE_SCREEN_H_
+#define CHROME_BROWSER_CHROMEOS_LOGIN_OOBE_SCREEN_H_
 
 #include <string>
 
 namespace chromeos {
 
+// TODO(jdufault): Rename to LoginScreen or similar since this is not directly

[achuithb, 2017/01/05 17:09:09]

Is this a short-lived TODO? Otherwise please also reference a bug.

[jdufault, 2017/01/05 23:51:42]

Added bug reference.

+// tied to Oobe.
+
 // Different screens in the Oobe. If you update this enum, *make sure* to
 // update kScreenNames in the cc file as well.
 enum class OobeScreen : unsigned int {
@@ -39,6 +42,15 @@ enum class OobeScreen : unsigned int {
   SCREEN_OOBE_HOST_PAIRING,
   SCREEN_DEVICE_DISABLED,
   SCREEN_UNRECOVERABLE_CRYPTOHOME_ERROR,
+  SCREEN_USER_SELECTION,
+
+  // Special "first screen" that initiates login flow.
+  SCREEN_SPECIAL_LOGIN,
+  // Special "first screen" that initiates full OOBE flow.
+  SCREEN_SPECIAL_OOBE,
+  // Special test value that commands not to create any window yet.
+  SCREEN_TEST_NO_WINDOW,
+
   SCREEN_UNKNOWN  // This must always be the last element.
 };
 
@@ -50,4 +62,4 @@ OobeScreen GetOobeScreenFromName(const std::string& name);
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_OOBE_SCREEN_H_
+#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_OOBE_SCREEN_H_