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

BUG=chromium-os:18878
TEST=make sure Advanced "Sign in with Google" appears in about:flags.

Review URL: http://codereview.chromium.org/7529037

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95960 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/about_flags.cc

@@ -344,6 +344,15 @@ const Experiment kExperiments[] = {
     kOsAll,
     SINGLE_VALUE_TYPE(switches::kEnableShortcutsProvider)
   },
+#if defined(OS_CHROMEOS)
+  {
+    "webui-login",
+    IDS_SYNC_SETUP_TITLE,
+    IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_ADVANCED_BUTTON,
+    kOsCrOS,
+    SINGLE_VALUE_TYPE(switches::kWebUILogin)
+  },
+#endif
   {
     "memory-widget",
     IDS_FLAGS_MEMORY_WIDGET_NAME,

chrome/browser/chromeos/login/base_login_display_host.cc

@@ -144,7 +144,7 @@ void BaseLoginDisplayHost::StartWizard(
   // is done before new controller creation.
   wizard_controller_.reset();
 
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAllowWebUIOobe)) {
+  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kWebUILogin)) {
     wizard_controller_.reset(CreateWizardController());
   } else {
     // Force views based implementation.

chrome/browser/chromeos/login/login_performer.cc

@@ -52,7 +52,7 @@ LoginPerformer::LoginPerformer(Delegate* delegate)
       auth_mode_(AUTH_MODE_INTERNAL),
       using_oauth_(
           CommandLine::ForCurrentProcess()->HasSwitch(
-              switches::kWebUIGaiaLogin) &&
+              switches::kWebUILogin) &&
           !CommandLine::ForCurrentProcess()->HasSwitch(
               switches::kSkipOAuthLogin)),
       method_factory_(this) {

chrome/browser/chromeos/login/parallel_authenticator.cc

@@ -60,7 +60,7 @@ ParallelAuthenticator::ParallelAuthenticator(LoginStatusConsumer* consumer)
       checked_for_localaccount_(false),
       using_oauth_(
           CommandLine::ForCurrentProcess()->HasSwitch(
-              switches::kWebUIGaiaLogin) &&
+              switches::kWebUILogin) &&
           !CommandLine::ForCurrentProcess()->HasSwitch(
                   switches::kSkipOAuthLogin)) {
   CHECK(chromeos::CrosLibrary::Get()->EnsureLoaded());

chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

@@ -62,7 +62,7 @@ SigninScreenHandler::SigninScreenHandler()
       oobe_ui_(false),
       extension_driven_(
           CommandLine::ForCurrentProcess()->HasSwitch(
-              switches::kWebUIGaiaLogin)) {
+              switches::kWebUILogin)) {
   delegate_->SetWebUIHandler(this);
 }
 

chrome/common/chrome_switches.cc

@@ -40,10 +40,6 @@ const char kAllowWebSocketProxy[]           = "allow-websocket-proxy";
 // 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";
@@ -1024,15 +1020,12 @@ const char kVersion[]                       = "version";
 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";
 

chrome/common/chrome_switches.h

@@ -30,7 +30,6 @@ extern const char kAllowHTTPBackgroundPage[];
 extern const char kAllowScriptingGallery[];
 extern const char kAllowWebSocketProxy[];
 extern const char kAllowWebUICompositing[];
-extern const char kAllowWebUIOobe[];
 extern const char kAlwaysAuthorizePlugins[];
 extern const char kAppId[];
 extern const char kApp[];
@@ -281,7 +280,6 @@ extern const char kWinHttpProxyResolver[];
 
 #if defined(OS_CHROMEOS)
 extern const char kWebUILogin[];
-extern const char kWebUIGaiaLogin[];
 extern const char kSkipOAuthLogin[];
 extern const char kEnableDevicePolicy[];
 extern const char kEnableGView[];