OLD | NEW |
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 12 matching lines...) Expand all Loading... |
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::TearDownOnMainThread() { | 32 void LoginManagerTest::TearDownOnMainThread() { |
| 33 MixinBasedBrowserTest::TearDownOnMainThread(); |
33 if (LoginDisplayHostImpl::default_host()) | 34 if (LoginDisplayHostImpl::default_host()) |
34 LoginDisplayHostImpl::default_host()->Finalize(); | 35 LoginDisplayHostImpl::default_host()->Finalize(); |
35 base::MessageLoop::current()->RunUntilIdle(); | 36 base::MessageLoop::current()->RunUntilIdle(); |
36 } | 37 } |
37 | 38 |
38 void LoginManagerTest::SetUpCommandLine(CommandLine* command_line) { | 39 void LoginManagerTest::SetUpCommandLine(CommandLine* command_line) { |
39 command_line->AppendSwitch(chromeos::switches::kLoginManager); | 40 command_line->AppendSwitch(chromeos::switches::kLoginManager); |
40 command_line->AppendSwitch(chromeos::switches::kForceLoginManagerInTests); | 41 command_line->AppendSwitch(chromeos::switches::kForceLoginManagerInTests); |
| 42 MixinBasedBrowserTest::SetUpCommandLine(command_line); |
41 } | 43 } |
42 | 44 |
43 void LoginManagerTest::SetUpInProcessBrowserTestFixture() { | 45 void LoginManagerTest::SetUpInProcessBrowserTestFixture() { |
44 mock_login_utils_ = new testing::NiceMock<MockLoginUtils>(); | 46 mock_login_utils_ = new testing::NiceMock<MockLoginUtils>(); |
45 mock_login_utils_->DelegateToFake(); | 47 mock_login_utils_->DelegateToFake(); |
46 mock_login_utils_->GetFakeLoginUtils()->set_should_launch_browser( | 48 mock_login_utils_->GetFakeLoginUtils()->set_should_launch_browser( |
47 should_launch_browser_); | 49 should_launch_browser_); |
48 LoginUtils::Set(mock_login_utils_); | 50 LoginUtils::Set(mock_login_utils_); |
| 51 MixinBasedBrowserTest::SetUpInProcessBrowserTestFixture(); |
49 } | 52 } |
50 | 53 |
51 void LoginManagerTest::SetUpOnMainThread() { | 54 void LoginManagerTest::SetUpOnMainThread() { |
52 content::WindowedNotificationObserver( | 55 content::WindowedNotificationObserver( |
53 chrome::NOTIFICATION_LOGIN_OR_LOCK_WEBUI_VISIBLE, | 56 chrome::NOTIFICATION_LOGIN_OR_LOCK_WEBUI_VISIBLE, |
54 content::NotificationService::AllSources()).Wait(); | 57 content::NotificationService::AllSources()).Wait(); |
55 InitializeWebContents(); | 58 InitializeWebContents(); |
| 59 MixinBasedBrowserTest::SetUpOnMainThread(); |
56 } | 60 } |
57 | 61 |
58 void LoginManagerTest::RegisterUser(const std::string& user_id) { | 62 void LoginManagerTest::RegisterUser(const std::string& user_id) { |
59 ListPrefUpdate users_pref(g_browser_process->local_state(), "LoggedInUsers"); | 63 ListPrefUpdate users_pref(g_browser_process->local_state(), "LoggedInUsers"); |
60 users_pref->AppendIfNotPresent(new base::StringValue(user_id)); | 64 users_pref->AppendIfNotPresent(new base::StringValue(user_id)); |
61 } | 65 } |
62 | 66 |
63 void LoginManagerTest::SetExpectedCredentials(const UserContext& user_context) { | 67 void LoginManagerTest::SetExpectedCredentials(const UserContext& user_context) { |
64 login_utils().GetFakeLoginUtils()->SetExpectedCredentials(user_context); | 68 login_utils().GetFakeLoginUtils()->SetExpectedCredentials(user_context); |
65 } | 69 } |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
118 EXPECT_TRUE(host != NULL); | 122 EXPECT_TRUE(host != NULL); |
119 | 123 |
120 content::WebContents* web_contents = | 124 content::WebContents* web_contents = |
121 host->GetWebUILoginView()->GetWebContents(); | 125 host->GetWebUILoginView()->GetWebContents(); |
122 EXPECT_TRUE(web_contents != NULL); | 126 EXPECT_TRUE(web_contents != NULL); |
123 set_web_contents(web_contents); | 127 set_web_contents(web_contents); |
124 js_checker_.set_web_contents(web_contents); | 128 js_checker_.set_web_contents(web_contents); |
125 } | 129 } |
126 | 130 |
127 } // namespace chromeos | 131 } // namespace chromeos |
OLD | NEW |