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

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

Issue 366813007: Removed InProcessBrowserTest::CleanUpOnMainThread() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed superfluous override. Created 6 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 unified diff | Download patch | Annotate | Revision Log
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/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_wizard.h" 10 #include "chrome/browser/chromeos/login/login_wizard.h"
(...skipping 23 matching lines...) Expand all
34 } 34 }
35 35
36 void WizardInProcessBrowserTest::SetUpOnMainThread() { 36 void WizardInProcessBrowserTest::SetUpOnMainThread() {
37 SetUpWizard(); 37 SetUpWizard();
38 if (!screen_name_.empty()) { 38 if (!screen_name_.empty()) {
39 ShowLoginWizard(screen_name_); 39 ShowLoginWizard(screen_name_);
40 host_ = LoginDisplayHostImpl::default_host(); 40 host_ = LoginDisplayHostImpl::default_host();
41 } 41 }
42 } 42 }
43 43
44 void WizardInProcessBrowserTest::CleanUpOnMainThread() { 44 void WizardInProcessBrowserTest::TearDownOnMainThread() {
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
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698