OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/chromeos/login/wizard_in_process_browser_test.h" | 5 #include "chrome/browser/chromeos/login/wizard_in_process_browser_test.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/message_loop.h" | 8 #include "base/message_loop.h" |
9 #include "chrome/browser/chromeos/login/base_login_display_host.h" | 9 #include "chrome/browser/chromeos/login/base_login_display_host.h" |
10 #include "chrome/browser/chromeos/login/login_wizard.h" | 10 #include "chrome/browser/chromeos/login/login_wizard.h" |
(...skipping 26 matching lines...) Expand all Loading... |
37 if (!screen_name_.empty()) { | 37 if (!screen_name_.empty()) { |
38 ShowLoginWizard(screen_name_, gfx::Size(1024, 600)); | 38 ShowLoginWizard(screen_name_, gfx::Size(1024, 600)); |
39 host_ = BaseLoginDisplayHost::default_host(); | 39 host_ = BaseLoginDisplayHost::default_host(); |
40 } | 40 } |
41 } | 41 } |
42 | 42 |
43 void WizardInProcessBrowserTest::CleanUpOnMainThread() { | 43 void WizardInProcessBrowserTest::CleanUpOnMainThread() { |
44 // LoginDisplayHost owns controllers and all windows. | 44 // LoginDisplayHost owns controllers and all windows. |
45 MessageLoopForUI::current()->DeleteSoon(FROM_HERE, host_); | 45 MessageLoopForUI::current()->DeleteSoon(FROM_HERE, host_); |
46 | 46 |
47 ui_test_utils::RunMessageLoop(); | 47 content::RunMessageLoop(); |
48 } | 48 } |
49 | 49 |
50 } // namespace chromeos | 50 } // namespace chromeos |
OLD | NEW |