Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(51)

Unified Diff: chrome/browser/chromeos/login/wizard_in_process_browser_test.cc

Issue 10808061: [cros] Flip enable-new-oobe switch. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/wizard_in_process_browser_test.cc
diff --git a/chrome/browser/chromeos/login/wizard_in_process_browser_test.cc b/chrome/browser/chromeos/login/wizard_in_process_browser_test.cc
index 4a4d4b0090a77269eb0da985b244fa0160160839..fd3aad3d9f2472f02a76babc94d03478a8d65a1b 100644
--- a/chrome/browser/chromeos/login/wizard_in_process_browser_test.cc
+++ b/chrome/browser/chromeos/login/wizard_in_process_browser_test.cc
@@ -22,6 +22,11 @@ WizardInProcessBrowserTest::WizardInProcessBrowserTest(const char* screen_name)
host_(NULL) {
}
+void WizardInProcessBrowserTest::SetUp() {
+ WizardController::SetZeroDelays();
+ InProcessBrowserTest::SetUp();
+}
+
void WizardInProcessBrowserTest::SetUpCommandLine(CommandLine* command_line) {
command_line->AppendSwitch(switches::kNoStartupWindow);
command_line->AppendSwitch(switches::kLoginManager);
@@ -29,9 +34,6 @@ void WizardInProcessBrowserTest::SetUpCommandLine(CommandLine* command_line) {
void WizardInProcessBrowserTest::SetUpOnMainThread() {
SetUpWizard();
-
- WizardController::SetZeroDelays();
-
if (!screen_name_.empty()) {
ShowLoginWizard(screen_name_, gfx::Size(1024, 600));
host_ = BaseLoginDisplayHost::default_host();
« no previous file with comments | « chrome/browser/chromeos/login/wizard_in_process_browser_test.h ('k') | chrome/browser/ui/webui/chromeos/login/oobe_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698