OLD | NEW |
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 "base/basictypes.h" | 5 #include "base/basictypes.h" |
6 #include "base/compiler_specific.h" | 6 #include "base/compiler_specific.h" |
7 #include "base/prefs/pref_service.h" | 7 #include "base/prefs/pref_service.h" |
8 #include "chrome/browser/chromeos/login/login_manager_test.h" | 8 #include "chrome/browser/chromeos/login/login_manager_test.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 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
114 private: | 114 private: |
115 DISALLOW_COPY_AND_ASSIGN(AccountsOptionsTest); | 115 DISALLOW_COPY_AND_ASSIGN(AccountsOptionsTest); |
116 }; | 116 }; |
117 | 117 |
118 IN_PROC_BROWSER_TEST_F(AccountsOptionsTest, PRE_MultiProfilesAccountsOptions) { | 118 IN_PROC_BROWSER_TEST_F(AccountsOptionsTest, PRE_MultiProfilesAccountsOptions) { |
119 RegisterUser(kTestUsers[0]); | 119 RegisterUser(kTestUsers[0]); |
120 RegisterUser(kTestUsers[1]); | 120 RegisterUser(kTestUsers[1]); |
121 StartupUtils::MarkOobeCompleted(); | 121 StartupUtils::MarkOobeCompleted(); |
122 } | 122 } |
123 | 123 |
124 // TODO(pastarmovj): Enable this test once https://crbug.com/362430 is fixed. | 124 IN_PROC_BROWSER_TEST_F(AccountsOptionsTest, MultiProfilesAccountsOptions) { |
125 IN_PROC_BROWSER_TEST_F(AccountsOptionsTest, | |
126 DISABLED_MultiProfilesAccountsOptions) { | |
127 LoginUser(kTestUsers[0]); | 125 LoginUser(kTestUsers[0]); |
128 UserAddingScreen::Get()->Start(); | 126 UserAddingScreen::Get()->Start(); |
129 content::RunAllPendingInMessageLoop(); | 127 content::RunAllPendingInMessageLoop(); |
130 AddUser(kTestUsers[1]); | 128 AddUser(kTestUsers[1]); |
131 | 129 |
132 UserManager* manager = UserManager::Get(); | 130 UserManager* manager = UserManager::Get(); |
133 ASSERT_EQ(2u, manager->GetLoggedInUsers().size()); | 131 ASSERT_EQ(2u, manager->GetLoggedInUsers().size()); |
134 | 132 |
135 CheckAccountsUI(manager->FindUser(kTestUsers[0]), true /* is_owner */); | 133 CheckAccountsUI(manager->FindUser(kTestUsers[0]), true /* is_owner */); |
136 CheckAccountsUI(manager->FindUser(kTestUsers[1]), false /* is_owner */); | 134 CheckAccountsUI(manager->FindUser(kTestUsers[1]), false /* is_owner */); |
137 } | 135 } |
138 | 136 |
139 } // namespace chromeos | 137 } // namespace chromeos |
OLD | NEW |