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/test/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/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
9 #include "chrome/browser/chrome_notification_types.h" | 9 #include "chrome/browser/chrome_notification_types.h" |
10 #include "chrome/browser/chromeos/login/login_display_host_impl.h" | |
11 #include "chrome/browser/chromeos/login/login_wizard.h" | 10 #include "chrome/browser/chromeos/login/login_wizard.h" |
| 11 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" |
12 #include "chrome/browser/chromeos/login/wizard_controller.h" | 12 #include "chrome/browser/chromeos/login/wizard_controller.h" |
13 #include "chrome/browser/ui/browser.h" | 13 #include "chrome/browser/ui/browser.h" |
14 #include "chrome/common/chrome_switches.h" | 14 #include "chrome/common/chrome_switches.h" |
15 #include "chrome/test/base/ui_test_utils.h" | 15 #include "chrome/test/base/ui_test_utils.h" |
16 #include "chromeos/chromeos_switches.h" | 16 #include "chromeos/chromeos_switches.h" |
17 #include "content/public/browser/notification_service.h" | 17 #include "content/public/browser/notification_service.h" |
18 | 18 |
19 namespace chromeos { | 19 namespace chromeos { |
20 | 20 |
21 WizardInProcessBrowserTest::WizardInProcessBrowserTest(const char* screen_name) | 21 WizardInProcessBrowserTest::WizardInProcessBrowserTest(const char* screen_name) |
(...skipping 20 matching lines...) Expand all Loading... |
42 } | 42 } |
43 | 43 |
44 void WizardInProcessBrowserTest::CleanUpOnMainThread() { | 44 void WizardInProcessBrowserTest::CleanUpOnMainThread() { |
45 // LoginDisplayHost owns controllers and all windows. | 45 // LoginDisplayHost owns controllers and all windows. |
46 base::MessageLoopForUI::current()->DeleteSoon(FROM_HERE, host_); | 46 base::MessageLoopForUI::current()->DeleteSoon(FROM_HERE, host_); |
47 | 47 |
48 base::MessageLoopForUI::current()->RunUntilIdle(); | 48 base::MessageLoopForUI::current()->RunUntilIdle(); |
49 } | 49 } |
50 | 50 |
51 } // namespace chromeos | 51 } // namespace chromeos |
OLD | NEW |