Consolidated OOBE/Login webui switched. Put WebUI OOBE/login in flags.

chrome/common/chrome_switches.cc

Index: chrome/common/chrome_switches.cc
===================================================================
--- chrome/common/chrome_switches.cc	(revision 95884)
+++ chrome/common/chrome_switches.cc	(working copy)
@@ -40,10 +40,6 @@
 // Allow compositing on chrome:// pages.
 const char kAllowWebUICompositing[]         = "allow-webui-compositing";
 
-// Allows WebUI based OOBE. Note, WebUI will be used iff kWebUILogin is also
-// true.
-const char kAllowWebUIOobe[]                = "allow-webui-oobe";
-
 // This prevents Chrome from requiring authorization to run certain widely
 // installed but less commonly used plug-ins.
 const char kAlwaysAuthorizePlugins[]        = "always-authorize-plugins";
@@ -1027,15 +1023,12 @@
 const char kWinHttpProxyResolver[]          = "winhttp-proxy-resolver";
 
 #if defined(OS_CHROMEOS)
-// Enable WebUI based login screens.
+// Enable WebUI based OOBE and login.
 const char kWebUILogin[]                    = "webui-login";
 
 // Skips OAuth part of ChromeOS login process.
 const char kSkipOAuthLogin[]                = "skip-oauth-login";
 
-// Enable WebUI login screen hosted by GAIA authentication extension.
-const char kWebUIGaiaLogin[]                = "webui-gaia-login";
-
 // Enables device policy support on ChromeOS.
 const char kEnableDevicePolicy[]            = "enable-device-policy";