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 <string> | 5 #include <string> |
6 | 6 |
7 #include "base/compiler_specific.h" | 7 #include "base/compiler_specific.h" |
8 #include "base/run_loop.h" | 8 #include "base/run_loop.h" |
9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
10 #include "base/threading/sequenced_worker_pool.h" | 10 #include "base/threading/sequenced_worker_pool.h" |
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
152 | 152 |
153 testing::Mock::VerifyAndClearExpectations(mock_homedir_methods_); | 153 testing::Mock::VerifyAndClearExpectations(mock_homedir_methods_); |
154 | 154 |
155 EXPECT_TRUE(registration_utility_stub_->register_was_called()); | 155 EXPECT_TRUE(registration_utility_stub_->register_was_called()); |
156 EXPECT_EQ(registration_utility_stub_->display_name(), | 156 EXPECT_EQ(registration_utility_stub_->display_name(), |
157 base::UTF8ToUTF16(kTestSupervisedUserDisplayName)); | 157 base::UTF8ToUTF16(kTestSupervisedUserDisplayName)); |
158 | 158 |
159 std::string user_id = registration_utility_stub_->supervised_user_id(); | 159 std::string user_id = registration_utility_stub_->supervised_user_id(); |
160 | 160 |
161 // Make sure user is already in list. | 161 // Make sure user is already in list. |
162 ASSERT_EQ(3UL, UserManager::Get()->GetUsers().size()); | 162 ASSERT_EQ(3UL, user_manager::UserManager::Get()->GetUsers().size()); |
163 | 163 |
164 // We wait for token now. Press cancel button at this point. | 164 // We wait for token now. Press cancel button at this point. |
165 JSEval("$('cancel-add-user-button').click()"); | 165 JSEval("$('cancel-add-user-button').click()"); |
166 } | 166 } |
167 | 167 |
168 IN_PROC_BROWSER_TEST_( | 168 IN_PROC_BROWSER_TEST_( |
169 SupervisedUserTransactionCleanupTest, | 169 SupervisedUserTransactionCleanupTest, |
170 DISABLED_CreateAndCancelSupervisedUser, | 170 DISABLED_CreateAndCancelSupervisedUser, |
171 SupervisedUserTransactionCleanupTest2, | 171 SupervisedUserTransactionCleanupTest2, |
172 testing::internal::GetTypeId<SupervisedUserTransactionCleanupTest>()) { | 172 testing::internal::GetTypeId<SupervisedUserTransactionCleanupTest>()) { |
173 // Make sure there is no supervised user in list. | 173 // Make sure there is no supervised user in list. |
174 ASSERT_EQ(2UL, UserManager::Get()->GetUsers().size()); | 174 ASSERT_EQ(2UL, user_manager::UserManager::Get()->GetUsers().size()); |
175 } | 175 } |
176 | 176 |
177 } // namespace chromeos | 177 } // namespace chromeos |
OLD | NEW |