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 "base/prefs/pref_service.h" | 5 #include "base/prefs/pref_service.h" |
6 #include "chrome/browser/chromeos/login/login_display_host_impl.h" | 6 #include "chrome/browser/chromeos/login/login_display_host_impl.h" |
7 #include "chrome/browser/chromeos/login/login_manager_test.h" | 7 #include "chrome/browser/chromeos/login/login_manager_test.h" |
8 #include "chrome/browser/chromeos/login/multi_profile_user_controller.h" | 8 #include "chrome/browser/chromeos/login/multi_profile_user_controller.h" |
9 #include "chrome/browser/chromeos/login/startup_utils.h" | 9 #include "chrome/browser/chromeos/login/startup_utils.h" |
10 #include "chrome/browser/chromeos/login/user_adding_screen.h" | 10 #include "chrome/browser/chromeos/login/user_adding_screen.h" |
(...skipping 21 matching lines...) Expand all Loading... |
32 public UserAddingScreen::Observer { | 32 public UserAddingScreen::Observer { |
33 public: | 33 public: |
34 UserAddingScreenTest() : LoginManagerTest(false), | 34 UserAddingScreenTest() : LoginManagerTest(false), |
35 user_adding_started_(0), | 35 user_adding_started_(0), |
36 user_adding_finished_(0) { | 36 user_adding_finished_(0) { |
37 } | 37 } |
38 | 38 |
39 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { | 39 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { |
40 LoginManagerTest::SetUpCommandLine(command_line); | 40 LoginManagerTest::SetUpCommandLine(command_line); |
41 command_line->AppendSwitch(::switches::kMultiProfiles); | 41 command_line->AppendSwitch(::switches::kMultiProfiles); |
| 42 command_line->AppendSwitch(switches::kForceMultiProfileInTests); |
42 } | 43 } |
43 | 44 |
44 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { | 45 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { |
45 LoginManagerTest::SetUpInProcessBrowserTestFixture(); | 46 LoginManagerTest::SetUpInProcessBrowserTestFixture(); |
46 UserAddingScreen::Get()->AddObserver(this); | 47 UserAddingScreen::Get()->AddObserver(this); |
47 } | 48 } |
48 | 49 |
49 virtual void OnUserAddingFinished() OVERRIDE { ++user_adding_finished_; } | 50 virtual void OnUserAddingFinished() OVERRIDE { ++user_adding_finished_; } |
50 | 51 |
51 virtual void OnUserAddingStarted() OVERRIDE { ++user_adding_started_; } | 52 virtual void OnUserAddingStarted() OVERRIDE { ++user_adding_started_; } |
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
175 // not be listed on screen lock. | 176 // not be listed on screen lock. |
176 prefs3->SetString(prefs::kMultiProfileUserBehavior, | 177 prefs3->SetString(prefs::kMultiProfileUserBehavior, |
177 MultiProfileUserController::kBehaviorNotAllowed); | 178 MultiProfileUserController::kBehaviorNotAllowed); |
178 unlock_users = user_manager->GetUnlockUsers(); | 179 unlock_users = user_manager->GetUnlockUsers(); |
179 ASSERT_EQ(2UL, unlock_users.size()); | 180 ASSERT_EQ(2UL, unlock_users.size()); |
180 for (int i = 0; i < 2; ++i) | 181 for (int i = 0; i < 2; ++i) |
181 EXPECT_EQ(kTestUsers[i], unlock_users[i]->email()); | 182 EXPECT_EQ(kTestUsers[i], unlock_users[i]->email()); |
182 } | 183 } |
183 | 184 |
184 } // namespace chromeos | 185 } // namespace chromeos |
OLD | NEW |