| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/test/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/location.h" | 8 #include "base/location.h" |
| 9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
| 10 #include "base/single_thread_task_runner.h" | 10 #include "base/single_thread_task_runner.h" |
| 11 #include "base/threading/thread_task_runner_handle.h" | |
| 12 #include "chrome/browser/chrome_notification_types.h" | 11 #include "chrome/browser/chrome_notification_types.h" |
| 13 #include "chrome/browser/chromeos/login/login_wizard.h" | 12 #include "chrome/browser/chromeos/login/login_wizard.h" |
| 14 #include "chrome/browser/chromeos/login/ui/login_display_host.h" | 13 #include "chrome/browser/chromeos/login/ui/login_display_host.h" |
| 15 #include "chrome/browser/chromeos/login/wizard_controller.h" | 14 #include "chrome/browser/chromeos/login/wizard_controller.h" |
| 16 #include "chrome/browser/ui/browser.h" | 15 #include "chrome/browser/ui/browser.h" |
| 17 #include "chrome/common/chrome_switches.h" | 16 #include "chrome/common/chrome_switches.h" |
| 18 #include "chromeos/chromeos_switches.h" | 17 #include "chromeos/chromeos_switches.h" |
| 19 #include "content/public/browser/notification_service.h" | 18 #include "content/public/browser/notification_service.h" |
| 20 | 19 |
| 21 namespace chromeos { | 20 namespace chromeos { |
| (...skipping 17 matching lines...) Expand all Loading... |
| 39 void WizardInProcessBrowserTest::SetUpOnMainThread() { | 38 void WizardInProcessBrowserTest::SetUpOnMainThread() { |
| 40 SetUpWizard(); | 39 SetUpWizard(); |
| 41 if (!screen_name_.empty()) { | 40 if (!screen_name_.empty()) { |
| 42 ShowLoginWizard(screen_name_); | 41 ShowLoginWizard(screen_name_); |
| 43 host_ = LoginDisplayHost::default_host(); | 42 host_ = LoginDisplayHost::default_host(); |
| 44 } | 43 } |
| 45 } | 44 } |
| 46 | 45 |
| 47 void WizardInProcessBrowserTest::TearDownOnMainThread() { | 46 void WizardInProcessBrowserTest::TearDownOnMainThread() { |
| 48 // LoginDisplayHost owns controllers and all windows. | 47 // LoginDisplayHost owns controllers and all windows. |
| 49 base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE, host_); | 48 base::MessageLoopForUI::current()->task_runner()->DeleteSoon(FROM_HERE, |
| 49 host_); |
| 50 | 50 |
| 51 base::MessageLoopForUI::current()->RunUntilIdle(); | 51 base::MessageLoopForUI::current()->RunUntilIdle(); |
| 52 } | 52 } |
| 53 | 53 |
| 54 } // namespace chromeos | 54 } // namespace chromeos |
| OLD | NEW |