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" |
11 #include "chrome/browser/chrome_notification_types.h" | 11 #include "chrome/browser/chrome_notification_types.h" |
12 #include "chrome/browser/chromeos/login/login_manager_test.h" | 12 #include "chrome/browser/chromeos/login/login_manager_test.h" |
13 #include "chrome/browser/chromeos/login/managed/managed_user_test_base.h" | |
14 #include "chrome/browser/chromeos/login/managed/supervised_user_authentication.h
" | |
15 #include "chrome/browser/chromeos/login/startup_utils.h" | 13 #include "chrome/browser/chromeos/login/startup_utils.h" |
| 14 #include "chrome/browser/chromeos/login/supervised/supervised_user_authenticatio
n.h" |
| 15 #include "chrome/browser/chromeos/login/supervised/supervised_user_test_base.h" |
16 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" | 16 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" |
17 #include "chrome/browser/chromeos/login/ui/webui_login_view.h" | 17 #include "chrome/browser/chromeos/login/ui/webui_login_view.h" |
18 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h" | 18 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h" |
19 #include "chrome/browser/chromeos/net/network_portal_detector_test_impl.h" | 19 #include "chrome/browser/chromeos/net/network_portal_detector_test_impl.h" |
20 #include "chrome/browser/chromeos/settings/stub_cros_settings_provider.h" | 20 #include "chrome/browser/chromeos/settings/stub_cros_settings_provider.h" |
21 #include "chrome/browser/supervised_user/supervised_user_constants.h" | 21 #include "chrome/browser/supervised_user/supervised_user_constants.h" |
22 #include "chrome/browser/supervised_user/supervised_user_registration_utility.h" | 22 #include "chrome/browser/supervised_user/supervised_user_registration_utility.h" |
23 #include "chrome/browser/supervised_user/supervised_user_registration_utility_st
ub.h" | 23 #include "chrome/browser/supervised_user/supervised_user_registration_utility_st
ub.h" |
24 #include "chrome/browser/supervised_user/supervised_user_shared_settings_service
.h" | 24 #include "chrome/browser/supervised_user/supervised_user_shared_settings_service
.h" |
25 #include "chrome/browser/supervised_user/supervised_user_shared_settings_service
_factory.h" | 25 #include "chrome/browser/supervised_user/supervised_user_shared_settings_service
_factory.h" |
26 #include "chrome/browser/supervised_user/supervised_user_sync_service.h" | 26 #include "chrome/browser/supervised_user/supervised_user_sync_service.h" |
27 #include "chrome/browser/supervised_user/supervised_user_sync_service_factory.h" | 27 #include "chrome/browser/supervised_user/supervised_user_sync_service_factory.h" |
28 #include "chromeos/cryptohome/mock_async_method_caller.h" | 28 #include "chromeos/cryptohome/mock_async_method_caller.h" |
29 #include "chromeos/cryptohome/mock_homedir_methods.h" | 29 #include "chromeos/cryptohome/mock_homedir_methods.h" |
30 #include "content/public/browser/notification_service.h" | 30 #include "content/public/browser/notification_service.h" |
31 #include "content/public/test/browser_test_utils.h" | 31 #include "content/public/test/browser_test_utils.h" |
32 #include "content/public/test/test_utils.h" | 32 #include "content/public/test/test_utils.h" |
33 #include "sync/api/attachments/attachment_service_proxy_for_test.h" | 33 #include "sync/api/attachments/attachment_service_proxy_for_test.h" |
34 #include "sync/api/fake_sync_change_processor.h" | 34 #include "sync/api/fake_sync_change_processor.h" |
35 #include "sync/api/sync_change.h" | 35 #include "sync/api/sync_change.h" |
36 #include "sync/api/sync_error_factory_mock.h" | 36 #include "sync/api/sync_error_factory_mock.h" |
37 #include "sync/protocol/sync.pb.h" | 37 #include "sync/protocol/sync.pb.h" |
38 | 38 |
39 using testing::_; | 39 using testing::_; |
40 using chromeos::ManagedUserTestBase; | 40 using chromeos::SupervisedUserTestBase; |
41 using chromeos::kTestSupervisedUserDisplayName; | 41 using chromeos::kTestSupervisedUserDisplayName; |
42 using chromeos::kTestManager; | 42 using chromeos::kTestManager; |
43 | 43 |
44 namespace chromeos { | 44 namespace chromeos { |
45 | 45 |
46 class SupervisedUserCreationTest : public ManagedUserTestBase { | 46 class SupervisedUserCreationTest : public SupervisedUserTestBase { |
47 public: | 47 public: |
48 SupervisedUserCreationTest() : ManagedUserTestBase() {} | 48 SupervisedUserCreationTest() : SupervisedUserTestBase() {} |
49 | 49 |
50 private: | 50 private: |
51 DISALLOW_COPY_AND_ASSIGN(SupervisedUserCreationTest); | 51 DISALLOW_COPY_AND_ASSIGN(SupervisedUserCreationTest); |
52 }; | 52 }; |
53 | 53 |
54 class SupervisedUserTransactionCleanupTest : public ManagedUserTestBase { | 54 class SupervisedUserTransactionCleanupTest : public SupervisedUserTestBase { |
55 public: | 55 public: |
56 SupervisedUserTransactionCleanupTest() : ManagedUserTestBase() {} | 56 SupervisedUserTransactionCleanupTest() : SupervisedUserTestBase() {} |
57 | 57 |
58 private: | 58 private: |
59 DISALLOW_COPY_AND_ASSIGN(SupervisedUserTransactionCleanupTest); | 59 DISALLOW_COPY_AND_ASSIGN(SupervisedUserTransactionCleanupTest); |
60 }; | 60 }; |
61 | 61 |
62 class SupervisedUserOwnerCreationTest : public ManagedUserTestBase { | 62 class SupervisedUserOwnerCreationTest : public SupervisedUserTestBase { |
63 public: | 63 public: |
64 SupervisedUserOwnerCreationTest() : ManagedUserTestBase() {} | 64 SupervisedUserOwnerCreationTest() : SupervisedUserTestBase() {} |
65 | 65 |
66 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { | 66 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { |
67 ManagedUserTestBase::SetUpInProcessBrowserTestFixture(); | 67 SupervisedUserTestBase::SetUpInProcessBrowserTestFixture(); |
68 cros_settings_provider_.reset(new StubCrosSettingsProvider()); | 68 cros_settings_provider_.reset(new StubCrosSettingsProvider()); |
69 cros_settings_provider_->Set(kDeviceOwner, base::StringValue(kTestManager)); | 69 cros_settings_provider_->Set(kDeviceOwner, base::StringValue(kTestManager)); |
70 } | 70 } |
71 | 71 |
72 private: | 72 private: |
73 scoped_ptr<StubCrosSettingsProvider> cros_settings_provider_; | 73 scoped_ptr<StubCrosSettingsProvider> cros_settings_provider_; |
74 DISALLOW_COPY_AND_ASSIGN(SupervisedUserOwnerCreationTest); | 74 DISALLOW_COPY_AND_ASSIGN(SupervisedUserOwnerCreationTest); |
75 }; | 75 }; |
76 | 76 |
77 class SupervisedUserTransactionCleanupTest2 | 77 class SupervisedUserTransactionCleanupTest2 |
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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, UserManager::Get()->GetUsers().size()); |
175 } | 175 } |
176 | 176 |
177 } // namespace chromeos | 177 } // namespace chromeos |
OLD | NEW |