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

Side by Side Diff: chrome/browser/chromeos/login/login_manager_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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/login_manager_test.h" 5 #include "chrome/browser/chromeos/login/login_manager_test.h"
6 6
7 #include "base/prefs/scoped_user_pref_update.h" 7 #include "base/prefs/scoped_user_pref_update.h"
8 #include "chrome/browser/browser_process.h" 8 #include "chrome/browser/browser_process.h"
9 #include "chrome/browser/chrome_notification_types.h" 9 #include "chrome/browser/chrome_notification_types.h"
10 #include "chrome/browser/chromeos/login/existing_user_controller.h" 10 #include "chrome/browser/chromeos/login/existing_user_controller.h"
(...skipping 11 matching lines...) Expand all
22 #include "testing/gtest/include/gtest/gtest.h" 22 #include "testing/gtest/include/gtest/gtest.h"
23 23
24 namespace chromeos { 24 namespace chromeos {
25 25
26 LoginManagerTest::LoginManagerTest(bool should_launch_browser) 26 LoginManagerTest::LoginManagerTest(bool should_launch_browser)
27 : should_launch_browser_(should_launch_browser), 27 : should_launch_browser_(should_launch_browser),
28 web_contents_(NULL) { 28 web_contents_(NULL) {
29 set_exit_when_last_browser_closes(false); 29 set_exit_when_last_browser_closes(false);
30 } 30 }
31 31
32 void LoginManagerTest::CleanUpOnMainThread() { 32 void LoginManagerTest::TearDownOnMainThread() {
33 if (LoginDisplayHostImpl::default_host()) 33 if (LoginDisplayHostImpl::default_host())
34 LoginDisplayHostImpl::default_host()->Finalize(); 34 LoginDisplayHostImpl::default_host()->Finalize();
35 base::MessageLoop::current()->RunUntilIdle(); 35 base::MessageLoop::current()->RunUntilIdle();
36 } 36 }
37 37
38 void LoginManagerTest::SetUpCommandLine(CommandLine* command_line) { 38 void LoginManagerTest::SetUpCommandLine(CommandLine* command_line) {
39 command_line->AppendSwitch(chromeos::switches::kLoginManager); 39 command_line->AppendSwitch(chromeos::switches::kLoginManager);
40 command_line->AppendSwitch(chromeos::switches::kForceLoginManagerInTests); 40 command_line->AppendSwitch(chromeos::switches::kForceLoginManagerInTests);
41 } 41 }
42 42
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 EXPECT_TRUE(host != NULL); 115 EXPECT_TRUE(host != NULL);
116 116
117 content::WebContents* web_contents = 117 content::WebContents* web_contents =
118 host->GetWebUILoginView()->GetWebContents(); 118 host->GetWebUILoginView()->GetWebContents();
119 EXPECT_TRUE(web_contents != NULL); 119 EXPECT_TRUE(web_contents != NULL);
120 set_web_contents(web_contents); 120 set_web_contents(web_contents);
121 js_checker_.set_web_contents(web_contents); 121 js_checker_.set_web_contents(web_contents);
122 } 122 }
123 123
124 } // namespace chromeos 124 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/login_manager_test.h ('k') | chrome/browser/chromeos/login/oobe_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698