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

chrome/browser/chromeos/login/base_login_display_host.cc

 // 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.
 
 #include "chrome/browser/chromeos/login/base_login_display_host.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/threading/thread_restrictions.h"
@@ skipping 126 matching lines @@
 void BaseLoginDisplayHost::StartWizard(
     const std::string& first_screen_name,
     const GURL& start_url) {
   DVLOG(1) << "Starting wizard, first_screen_name: " << first_screen_name;
   // Create and show the wizard.
   // Note, dtor of the old WizardController should be called before ctor of the
   // new one, because "default_controller()" is updated there. So pure "reset()"
   // 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.
     wizard_controller_.reset(BaseLoginDisplayHost::CreateWizardController());
   }
 
   wizard_controller_->set_start_url(start_url);
   ShowBackground();
   if (!WizardController::IsDeviceRegistered())
     SetOobeProgressBarVisible(true);
@@ skipping 183 matching lines @@
     if (!timezone_name.empty()) {
       icu::TimeZone* timezone = icu::TimeZone::createTimeZone(
           icu::UnicodeString::fromUTF8(timezone_name));
       CHECK(timezone) << "Timezone could not be set for " << timezone_name;
       chromeos::system::TimezoneSettings::GetInstance()->SetTimezone(*timezone);
     }
   }
 }
 
 }  // namespace browser