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

Side by Side Diff: chrome/browser/chromeos/login/test/wizard_in_process_browser_test.cc

Issue 2354333002: Remove calls to MessageLoop(ForUI|ForIO)::Run/RunUntilIdle. (Closed)
Patch Set: fix build error Created 4 years, 2 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 unified diff | Download patch
OLDNEW
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/run_loop.h"
10 #include "base/single_thread_task_runner.h" 11 #include "base/single_thread_task_runner.h"
12 #include "base/threading/thread_task_runner_handle.h"
11 #include "chrome/browser/chrome_notification_types.h" 13 #include "chrome/browser/chrome_notification_types.h"
12 #include "chrome/browser/chromeos/login/login_wizard.h" 14 #include "chrome/browser/chromeos/login/login_wizard.h"
13 #include "chrome/browser/chromeos/login/ui/login_display_host.h" 15 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
14 #include "chrome/browser/chromeos/login/wizard_controller.h" 16 #include "chrome/browser/chromeos/login/wizard_controller.h"
15 #include "chrome/browser/ui/browser.h" 17 #include "chrome/browser/ui/browser.h"
16 #include "chrome/common/chrome_switches.h" 18 #include "chrome/common/chrome_switches.h"
17 #include "chromeos/chromeos_switches.h" 19 #include "chromeos/chromeos_switches.h"
18 #include "content/public/browser/notification_service.h" 20 #include "content/public/browser/notification_service.h"
19 21
20 namespace chromeos { 22 namespace chromeos {
(...skipping 16 matching lines...) Expand all
37 39
38 void WizardInProcessBrowserTest::SetUpOnMainThread() { 40 void WizardInProcessBrowserTest::SetUpOnMainThread() {
39 SetUpWizard(); 41 SetUpWizard();
40 if (!screen_name_.empty()) { 42 if (!screen_name_.empty()) {
41 ShowLoginWizard(screen_name_); 43 ShowLoginWizard(screen_name_);
42 host_ = LoginDisplayHost::default_host(); 44 host_ = LoginDisplayHost::default_host();
43 } 45 }
44 } 46 }
45 47
46 void WizardInProcessBrowserTest::TearDownOnMainThread() { 48 void WizardInProcessBrowserTest::TearDownOnMainThread() {
49 ASSERT_TRUE(base::MessageLoopForUI::IsCurrent());
50
47 // LoginDisplayHost owns controllers and all windows. 51 // LoginDisplayHost owns controllers and all windows.
48 base::MessageLoopForUI::current()->task_runner()->DeleteSoon(FROM_HERE, 52 base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE, host_);
49 host_); 53 base::RunLoop().RunUntilIdle();
50
51 base::MessageLoopForUI::current()->RunUntilIdle();
52 } 54 }
53 55
54 } // namespace chromeos 56 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698