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 "ash/common/system/status_area_widget.h" | 7 #include "ash/common/system/status_area_widget.h" |
8 #include "ash/common/system/web_notification/web_notification_tray.h" | 8 #include "ash/common/system/web_notification/web_notification_tray.h" |
9 #include "ash/test/status_area_widget_test_helper.h" | 9 #include "ash/test/status_area_widget_test_helper.h" |
10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
70 DISALLOW_COPY_AND_ASSIGN(SupervisedUserTransactionCleanupTest); | 70 DISALLOW_COPY_AND_ASSIGN(SupervisedUserTransactionCleanupTest); |
71 }; | 71 }; |
72 | 72 |
73 class SupervisedUserOwnerCreationTest : public SupervisedUserTestBase { | 73 class SupervisedUserOwnerCreationTest : public SupervisedUserTestBase { |
74 public: | 74 public: |
75 SupervisedUserOwnerCreationTest() : SupervisedUserTestBase() {} | 75 SupervisedUserOwnerCreationTest() : SupervisedUserTestBase() {} |
76 | 76 |
77 void SetUpInProcessBrowserTestFixture() override { | 77 void SetUpInProcessBrowserTestFixture() override { |
78 SupervisedUserTestBase::SetUpInProcessBrowserTestFixture(); | 78 SupervisedUserTestBase::SetUpInProcessBrowserTestFixture(); |
79 cros_settings_provider_.reset(new StubCrosSettingsProvider()); | 79 cros_settings_provider_.reset(new StubCrosSettingsProvider()); |
80 cros_settings_provider_->Set(kDeviceOwner, base::StringValue(kTestManager)); | 80 cros_settings_provider_->Set(kDeviceOwner, base::Value(kTestManager)); |
81 } | 81 } |
82 | 82 |
83 private: | 83 private: |
84 std::unique_ptr<StubCrosSettingsProvider> cros_settings_provider_; | 84 std::unique_ptr<StubCrosSettingsProvider> cros_settings_provider_; |
85 DISALLOW_COPY_AND_ASSIGN(SupervisedUserOwnerCreationTest); | 85 DISALLOW_COPY_AND_ASSIGN(SupervisedUserOwnerCreationTest); |
86 }; | 86 }; |
87 | 87 |
88 class SupervisedUserTransactionCleanupTest2 | 88 class SupervisedUserTransactionCleanupTest2 |
89 : public SupervisedUserTransactionCleanupTest { | 89 : public SupervisedUserTransactionCleanupTest { |
90 public: | 90 public: |
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
242 IN_PROC_BROWSER_TEST_( | 242 IN_PROC_BROWSER_TEST_( |
243 SupervisedUserTransactionCleanupTest, | 243 SupervisedUserTransactionCleanupTest, |
244 CreateAndCancelSupervisedUser, | 244 CreateAndCancelSupervisedUser, |
245 SupervisedUserTransactionCleanupTest2, | 245 SupervisedUserTransactionCleanupTest2, |
246 testing::internal::GetTypeId<SupervisedUserTransactionCleanupTest>()) { | 246 testing::internal::GetTypeId<SupervisedUserTransactionCleanupTest>()) { |
247 // Make sure there is no supervised user in list. | 247 // Make sure there is no supervised user in list. |
248 ASSERT_EQ(2UL, user_manager::UserManager::Get()->GetUsers().size()); | 248 ASSERT_EQ(2UL, user_manager::UserManager::Get()->GetUsers().size()); |
249 } | 249 } |
250 | 250 |
251 } // namespace chromeos | 251 } // namespace chromeos |
OLD | NEW |